From 4d26a3589b9872ee88882fdb10bac0aaf7d39276 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Thu, 1 Oct 2020 20:32:20 +0200
Subject: [PATCH] Redirect from EXTRA_DOMAINS

See compose-stacks/organising#15
---
 .envrc.sample |  3 ++-
 compose.yml   | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.envrc.sample b/.envrc.sample
index 814ca57..36a0827 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -1,7 +1,8 @@
 export SERVICE=drone
 export STACK_NAME=drone
 
-export DOMAIN=git.example.com
+export DOMAIN=drone.example.com
+export EXTRA_DOMAINS=', `www.drone.example.com`'
 export LETS_ENCRYPT_ENV=production
 
 export DRONE_ENV_VERSION=v1
diff --git a/compose.yml b/compose.yml
index 8079192..2824ef8 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,10 +32,13 @@ services:
         order: start-first
       labels:
         - "traefik.enable=true"
-        - "traefik.http.routers.drone.rule=Host(`${DOMAIN}`)"
-        - "traefik.http.routers.drone.entrypoints=web-secure"
-        - "traefik.http.services.drone.loadbalancer.server.port=${PORT:-8042}"
-        - "traefik.http.routers.drone.tls.certresolver=${LETS_ENCRYPT_ENV}"
+        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
+        - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
+        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=${PORT:-8042}"
+        - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
+        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
 
 volumes:
   data: