Add EXTRA_DOMAINS support

See compose-stacks/organising#19

.envrc.sample

@@ -1,4 +1,6 @@
 export DOMAIN=wordpress.example.com
+## Domain aliases
+#export EXTRA_DOMAINS=', `www.wordpress.example.com`'
 
 export STACK_NAME=wordpress
 export LETS_ENCRYPT_ENV=production

README.md

@@ -15,7 +15,6 @@ Coöp Cloud + [Wordpress](https://wordpress.org) = 🥳
    abra secret_generate db_password v1
    abra secret_generate db_root_password v1
    ```
-
 7. `abra deploy`
 8. Open the configured domain in your browser to finish set-up
 9. `abra run wordpress chown www-data:www-data /var/www/html/wp-content` to fix

compose.mailrelay.yml

@@ -2,7 +2,7 @@
 version: "3.8"
  
 services:
-  wordpress:
+  app:
     entrypoint: /docker-entrypoint.sh
     environment:
       - SMTP_HOST=${SMTP_HOST}

compose.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 
 services:
-  wordpress:
+  app:
     image: "wordpress:5.5.1"
     volumes:
       - "wordpress_content:/var/www/html/wp-content/"
@@ -10,13 +10,21 @@ services:
       - backend
       - proxy
     environment:
-      - WORDPRESS_DB_HOST=mariadb
+      - WORDPRESS_DB_HOST=db
       - WORDPRESS_DB_USER=wordpress
       - WORDPRESS_DB_PASSWORD_FILE=/run/secrets/db_password
       - WORDPRESS_DB_NAME=wordpress
       - WORDPRESS_CONFIG_EXTRA=${WORDPRESS_CONFIG_EXTRA}
     secrets:
       - db_password
+    depends_on:
+      - db
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
     deploy:
       update_config:
         failure_action: rollback
@@ -26,14 +34,14 @@ services:
         - "traefik.docker.network=proxy"
         - "traefik.http.routers.${STACK_NAME}.tls=true"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
-        - "traefik.http.routers.${STACK_NAME}.rule=Host(`ch.${DOMAIN}`, `${DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         # 3wc: this rule works for routing, but not for generating certificates
         # see https://git.autonomic.zone/compose-stacks/planning/issues/14
         #- "traefik.http.routers.${STACK_NAME}.rule=HostRegexp(`{subdomain:.+}.${DOMAIN}`, `${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
 
-  mariadb:
+  db:
     image: "mariadb:10.5"
     volumes:
       - "mariadb:/var/lib/mysql"