[mass update] fix supporting multiple domains while enforcing ssl

.env.sample

@@ -16,7 +16,6 @@ SECRET_SSO_CERT_VERSION=v1
 # SSO_PROVIDER_URL=https://authentik.example.com/
 # SSO_SAML_URL=https://authentik.example.com/application/saml/kimai/sso/binding/redirect/
 # SSO_LOGOUT_URL=https://authentik.example.com/application/saml/kimai/slo/binding/redirect/
-# SSO_ADMIN_GROUP_NAME=kimai_admin
 
 # MAILER_URL="smtp://<from>:<password>%3F@<mailserver>:587"
 # MAILER_FROM="Kimai Notifications noreply@example.com"

abra.sh

@@ -1,5 +1,5 @@
 export ENTRYPOINT_CONF_VERSION=v2
-export LOCAL_CONF_VERSION=v5
+export LOCAL_CONF_VERSION=v3
 
 create_admin () {
     export DATABASE_URL="$DATABASE_TYPE://$DATABASE_USER:$(cat /run/secrets/db_password)@$DATABASE_HOST/$DATABASE_NAME"

compose.yml

@@ -1,10 +1,10 @@
 version: '3.8'
 services:
   app:
-    image: kimai/kimai2:2.69.0
+    image: kimai/kimai2:apache-2.34.0
     environment:
       - APP_ENV=prod
-      - TRUSTED_HOSTS=localhost|traefik|${DOMAIN}|127.0.0.1
+      - TRUSTED_HOSTS=localhost,traefik,${DOMAIN},127.0.0.1
       - TRUSTED_PROXIES=localhost,traefik,127.0.0.1
       - ADMINMAIL=admin@kimai.local
       - ADMINPASS_FILE=/run/secrets/admin_password
@@ -18,7 +18,6 @@ services:
       - SSO_PROVIDER_URL
       - SSO_SAML_URL
       - SSO_LOGOUT_URL
-      - SSO_ADMIN_GROUP_NAME
       - MAILER_URL
       - MAILER_FROM
     volumes:
@@ -41,9 +40,9 @@ services:
       - db
     entrypoint: /docker-entrypoint.sh
     healthcheck:
-     test: curl -fsS -o /dev/null http://localhost:8001 || exit 1
+     test: curl -s -o /dev/null http://localhost:8001 || exit 1
      interval: 30s
-     start_period: 20m
+     start_period: 3m
      timeout: 10s
      retries: 10
     deploy:
@@ -51,16 +50,16 @@ services:
         condition: on-failure
       labels:
         - "traefik.enable=true"
-        - "traefik.swarm.network=proxy"
+        - "traefik.docker.network=proxy"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=8001"
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "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}"
-        - "coop-cloud.${STACK_NAME}.version=1.14.0+2.69.0"
-        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
+        - "coop-cloud.${STACK_NAME}.version=1.4.0+apache-2.34.0"
+        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
   db:
     image: mysql:5.7
     environment:

local.yaml.tmpl

@@ -11,9 +11,7 @@ kimai:
       attribute: http://schemas.xmlsoap.org/claims/Group
       mapping:
       # Insert your roles here (ROLE_USER is added automatically)
-{{ if env "SSO_ADMIN_GROUP_NAME" }}
-        - { saml: {{ env "SSO_ADMIN_GROUP_NAME" }}, kimai: ROLE_SUPER_ADMIN }
-{{ end }}
+        - { saml: admin.group, kimai: ROLE_SUPER_ADMIN }
         - { saml: "authentik Admins", kimai: ROLE_SUPER_ADMIN }
     connection:
       # You SAML provider

release/1.9.1+2.61.0

@@ -1 +0,0 @@
-Adds kimai_group as admin group for SSO with authentik