From c282c5716b4e7eb5af063f48da27c9f9dde6b22e Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 28 Oct 2018 14:53:10 -0400 Subject: [PATCH 1/4] More flexibility for testing --- templates/EclipseChe-Single/0/docker-compose.yml | 2 +- templates/EclipseChe-Single/0/rancher-compose.yml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/templates/EclipseChe-Single/0/docker-compose.yml b/templates/EclipseChe-Single/0/docker-compose.yml index d7f7c41..00d9dc0 100644 --- a/templates/EclipseChe-Single/0/docker-compose.yml +++ b/templates/EclipseChe-Single/0/docker-compose.yml @@ -26,7 +26,7 @@ services: traefik.frontend.auth.basic: ${TRAEFIK_BASIC_AUTH} {{- end}} traefik.frontend.entryPoints: http,https - traefik.frontend.rule: Host:${TRAEFIK_HOST} + traefik.frontend.rule: ${TRAEFIK_HOST} traefik.frontend.passHostHeader: true {{- else}} traefik.enable: false diff --git a/templates/EclipseChe-Single/0/rancher-compose.yml b/templates/EclipseChe-Single/0/rancher-compose.yml index 33e3f0f..16d2f8b 100644 --- a/templates/EclipseChe-Single/0/rancher-compose.yml +++ b/templates/EclipseChe-Single/0/rancher-compose.yml @@ -16,12 +16,19 @@ catalog: required: false type: string + - variable: "CHE_HOST" + label: "CHE_HOST" + description: | + default: "subdomain.domain.tld" + required: false + type: string + - variable: "TRAEFIK_HOST" label: "Public Host Domain" description: | The host that Traefik will use to provide public access. Leaving this empty will disable Traefik on this stack. - default: "subdomain.domain.tld" + default: "Host:subdomain.domain.tld" required: false type: string From 6fd618ce673f76fb3bc6912600db9d4f8ca5d73f Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 28 Oct 2018 15:15:53 -0400 Subject: [PATCH 2/4] Proper allowing of wildcard subdomains --- templates/EclipseChe-Single/0/rancher-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/EclipseChe-Single/0/rancher-compose.yml b/templates/EclipseChe-Single/0/rancher-compose.yml index 16d2f8b..58ab725 100644 --- a/templates/EclipseChe-Single/0/rancher-compose.yml +++ b/templates/EclipseChe-Single/0/rancher-compose.yml @@ -28,7 +28,7 @@ catalog: description: | The host that Traefik will use to provide public access. Leaving this empty will disable Traefik on this stack. - default: "Host:subdomain.domain.tld" + default: "Host:subdomain.domain.tld,HostRegexp:.*.subdomain.domain.tld" required: false type: string From 27a493901b7828902ed9ff6e0b1c95280aef017b Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 28 Oct 2018 15:21:21 -0400 Subject: [PATCH 3/4] Strange issue testing --- templates/EclipseChe-Single/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/EclipseChe-Single/0/docker-compose.yml b/templates/EclipseChe-Single/0/docker-compose.yml index 00d9dc0..2a46efa 100644 --- a/templates/EclipseChe-Single/0/docker-compose.yml +++ b/templates/EclipseChe-Single/0/docker-compose.yml @@ -27,7 +27,7 @@ services: {{- end}} traefik.frontend.entryPoints: http,https traefik.frontend.rule: ${TRAEFIK_HOST} - traefik.frontend.passHostHeader: true + traefik.frontend.passHostHeader: false {{- else}} traefik.enable: false {{- end}} From 0bd5e69c8c348a96bc2cf998553334cdde064e69 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sun, 28 Oct 2018 15:37:31 -0400 Subject: [PATCH 4/4] Testing --- templates/EclipseChe-Single/0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/EclipseChe-Single/0/docker-compose.yml b/templates/EclipseChe-Single/0/docker-compose.yml index 2a46efa..00d9dc0 100644 --- a/templates/EclipseChe-Single/0/docker-compose.yml +++ b/templates/EclipseChe-Single/0/docker-compose.yml @@ -27,7 +27,7 @@ services: {{- end}} traefik.frontend.entryPoints: http,https traefik.frontend.rule: ${TRAEFIK_HOST} - traefik.frontend.passHostHeader: false + traefik.frontend.passHostHeader: true {{- else}} traefik.enable: false {{- end}}