From 91c65abb912f50fcaf8a1be32f6c7cc8498af2f7 Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <kris@lamoureux.io>
Date: Sun, 20 Nov 2022 21:32:39 -0500
Subject: [PATCH] Redirect to www from root domain

---
 dev/vars/webserver.yml                   | 4 +++-
 roles/webserver/files/docker-compose.yml | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev/vars/webserver.yml b/dev/vars/webserver.yml
index 1ebb7b5..b073f16 100644
--- a/dev/vars/webserver.yml
+++ b/dev/vars/webserver.yml
@@ -3,6 +3,7 @@
 ###############
 secret:
   WORDPRESS_DB_PASSWORD: WPpa55w0rd!
+  TRAEFIK_DREAMHOST_APIKEY: DHap1pa55w0rd!
 
 ##############
 ### Docker ###
@@ -32,8 +33,9 @@ webserver:
   #TRAEFIK_WEB_ENABLED: true
   TRAEFIK_DEBUG: true
   TRAEFIK_ACME_PROVIDER: dreamhost
-  TRAEFIK_ACME_CASERVER: https://acme-v02.api.letsencrypt.org/directory
+  TRAEFIK_ACME_CASERVER: https://localhost/directory
   TRAEFIK_ACME_EMAIL: frita@example.org
+  TRAEFIK_DREAMHOST_APIKEY: "{{ secret.TRAEFIK_DREAMHOST_APIKEY }}"
 
   #################
   ### WordPress ###
diff --git a/roles/webserver/files/docker-compose.yml b/roles/webserver/files/docker-compose.yml
index e0a22c7..6378020 100644
--- a/roles/webserver/files/docker-compose.yml
+++ b/roles/webserver/files/docker-compose.yml
@@ -59,12 +59,16 @@ services:
       WORDPRESS_DB_USER: ${WORDPRESS_DB_USER:-wordpress}
       WORDPRESS_DB_PASSWORD: ${WORDPRESS_DB_PASSWORD}
     labels:
-      traefik.http.routers.wordpress.rule: Host(`${WORDPRESS_DOMAIN:-www.local.freeitathens.org}`)
+      traefik.http.routers.wordpress.rule: Host(`${WORDPRESS_DOMAIN:-www.local.freeitathens.org}`,`${TRAEFIK_ACME_DOMAIN_MAIN:-local.freeitathens.org}`)
       traefik.http.routers.wordpress.entrypoints: websecure
+      traefik.http.routers.wordpress.middlewares: "wwwredirect"
       traefik.http.routers.wordpress.tls: true
       traefik.http.routers.wordpress.tls.certresolver: letsencrypt
       traefik.http.routers.wordpress.tls.domains[0].main: ${TRAEFIK_ACME_DOMAIN_MAIN:-local.freeitathens.org}
       traefik.http.routers.wordpress.tls.domains[0].sans: "${TRAEFIK_ACME_DOMAIN_SANS:-*.local.freeitathens.org}"
+      traefik.http.middlewares.wwwredirect.redirectregex.regex: "^https://${TRAEFIK_ACME_DOMAIN_MAIN:-local.freeitathens.org}/(.*)"
+      traefik.http.middlewares.wwwredirect.redirectregex.replacement: "https://${WORDPRESS_DOMAIN:-www.local.freeitathens.org}/$${1}"
+      traefik.http.middlewares.wwwredirect.redirectregex.permanent: true
       traefik.http.services.wordpress.loadbalancer.server.port: 80
       traefik.docker.network: traefik
       traefik.enable: ${WORDPRESS_WEB_ENABLED:-true}