From 7c9c0b05198a2f7aa8cf95029e9105e30c8a140d Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Wed, 16 Jan 2019 15:38:22 -0500 Subject: [PATCH] Fixed Rancher questions --- templates/Guacamole/0/docker-compose.yml | 2 +- templates/Guacamole/0/rancher-compose.yml | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/templates/Guacamole/0/docker-compose.yml b/templates/Guacamole/0/docker-compose.yml index a06d75e..09d9112 100644 --- a/templates/Guacamole/0/docker-compose.yml +++ b/templates/Guacamole/0/docker-compose.yml @@ -24,7 +24,7 @@ services: traefik.web.frontend.headers.SSLRedirect: true traefik.web.frontend.headers.STSPreload: true traefik.web.frontend.headers.STSSeconds: 15552000 - traefik.web.frontend.rule: Host:${TRAEFIK_HOST} + traefik.web.frontend.rule: Host:${TRAEFIK_HOSTNAME} traefik.web.port: "8080" ### End Web Segment links: diff --git a/templates/Guacamole/0/rancher-compose.yml b/templates/Guacamole/0/rancher-compose.yml index bf0f58e..b71dddc 100644 --- a/templates/Guacamole/0/rancher-compose.yml +++ b/templates/Guacamole/0/rancher-compose.yml @@ -17,35 +17,26 @@ catalog: required: false type: string - - variable: "TRAEFIK_HOST" - label: "Public Host Domain" + - variable: "TRAEFIK_HOSTNAME" + label: "Public Hostname" description: | - The host that Traefik will use to provide public access. - Leaving this empty will disable Traefik on this stack. + The FQDN which Traefik should use to provide public access. default: "subdomain.domain.tld" - required: false - type: string - - - variable: "WEB_PORT" - label: "Local Web Port" - description: | - The port to locally access the web interface on. - default: "10700" required: true type: string - variable: "DB_ROOT_PASS" - label: "MySQL Root Password" + label: "Database Root Password" description: | - A secure password to be used by the "root" MySQL user. + A secure password to be used by the "root" user. # default: required: true type: password - variable: "DB_USER_PASS" - label: "MySQL User Password" + label: "Database User Password" description: | - A secure password to be used by the "guacamole_user" MySQL user. + A secure password to be used by the "guacamole_user" user. # default: required: true type: password