[mass update] fix supporting multiple domains while enforcing ssl

.drone.yml

@@ -0,0 +1,41 @@
+---
+kind: pipeline
+name: deploy to swarm-test.autonomic.zone
+steps:
+  - name: deployment
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
+    settings:
+      host: swarm-test.autonomic.zone
+      stack: firefly-iii
+      generate_secrets: true
+      purge: true
+      deploy_key:
+        from_secret: drone_ssh_swarm_test
+      networks:
+        - proxy
+    environment:
+      DOMAIN: firefly-iii.swarm-test.autonomic.zone
+      STACK_NAME: firefly-iii
+      LETS_ENCRYPT_ENV: production
+      SECRET_APP_KEY_VERSION: v1
+      SECRET_STATIC_CRON_TOKEN_VERSION: v1
+      SECRET_DB_PASSWORD_VERSION: v1
+trigger:
+  branch:
+    - main
+---
+kind: pipeline
+name: generate recipe catalogue
+steps:
+  - name: release a new version
+    image: plugins/downstream
+    settings:
+      server: https://build.coopcloud.tech
+      token:
+        from_secret: drone_abra-bot_token
+      fork: true
+      repositories:
+        - toolshed/auto-recipes-catalogue-json
+
+trigger:
+  event: tag

.env.sample

@@ -1,5 +1,5 @@
 TYPE=firefly-iii
-DOMAIN=example.com
+DOMAIN=firefly-iii.example.com
 LETS_ENCRYPT_ENV=production
 
 APP_NAME=FireflyIII

compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   app:
-    image: fireflyiii/core:version-5.5.13
+    image: fireflyiii/core:version-6.2.9
     volumes:
       - firefly_iii_upload:/var/www/html/storage/upload
     secrets:
@@ -86,8 +86,8 @@ services:
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "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}"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
         - coop-cloud.${STACK_NAME}.web.version=0.1
     healthcheck:
       test: ["CMD", "curl", "http://localhost:8080"]
@@ -121,7 +121,7 @@ volumes:
    firefly_iii_db:
 secrets:
   cron_token:
-    name: ${STACK_NAME}_static_cron_token_${SECRET_STATIC_CRON_TOKEN_VERSION}
+    name: ${STACK_NAME}_cron_token_${SECRET_STATIC_CRON_TOKEN_VERSION}
     external: true
   app_key:
     name: ${STACK_NAME}_app_key_${SECRET_APP_KEY_VERSION}