From 955ffa2d33fff42d2ad4c5d29a1acf6c2d6e5158 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 29 Dec 2018 16:07:33 -0500 Subject: [PATCH] Allowing use of sub-subdomains --- templates/XWiki/0/README.md | 3 ++- templates/XWiki/0/docker-compose.yml | 2 +- templates/XWiki/0/rancher-compose.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/XWiki/0/README.md b/templates/XWiki/0/README.md index ec1371a..75cdd23 100644 --- a/templates/XWiki/0/README.md +++ b/templates/XWiki/0/README.md @@ -6,4 +6,5 @@ ### TODO -* Fix issue with some page assets being delivered over http instead of https \ No newline at end of file +* Fix issue with some page assets being delivered over http instead of https +* Document setting up domain DNS \ No newline at end of file diff --git a/templates/XWiki/0/docker-compose.yml b/templates/XWiki/0/docker-compose.yml index 235c0d7..c1ae212 100644 --- a/templates/XWiki/0/docker-compose.yml +++ b/templates/XWiki/0/docker-compose.yml @@ -26,7 +26,7 @@ services: traefik.frontend.headers.SSLRedirect: true traefik.frontend.headers.STSPreload: true traefik.frontend.headers.STSSeconds: 15552000 - traefik.frontend.rule: Host:${TRAEFIK_HOST} + traefik.frontend.rule: ${TRAEFIK_HOST} traefik.port: "8080" ### End Web Segment {{- else}} diff --git a/templates/XWiki/0/rancher-compose.yml b/templates/XWiki/0/rancher-compose.yml index 8f433c1..59bd5ee 100644 --- a/templates/XWiki/0/rancher-compose.yml +++ b/templates/XWiki/0/rancher-compose.yml @@ -21,7 +21,7 @@ catalog: 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: "HostRegexp:{subdomain:.*}subdomain.domain.tld" required: false type: string