add smtp_debug env var

.env.sample

@@ -31,29 +31,6 @@ TX="Europe/Berlin"
 #SMTP_HOST=mail.example.com
 #SMTP_PORT=587
 #SMTP_SECURITY=starttls
-
-## SSO Setup Start ##
-
-## SSO Required Setup
-#COMPOSE_FILE="$COMPOSE_FILE:compose.sso.yml"
-#SSO_ENABLED=false ## Activate the SSO
-
-## the OpenID Connect Discovery endpoint of your SSO. Should not include the /.well-known/openid-configuration part and no trailing / ${SSO_AUTHORITY}/.well-known/openid-configuration must return a JSON document: https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfigurationResponse (with an HTTP status code 200 OK!)
-#SSO_AUTHORITY=
-#SSO_CLIENT_ID=             
-#SSO_CLIENT_SECRET= 
-#SSO_ONLY=false ## disable email+Master password authentication
-
-## SSO Optional Setup
-#SSO_SIGNUPS_MATCH_EMAIL=true ##: On SSO Signup if a user with a matching email already exists make the association (default true)
-#SSO_ALLOW_UNKNOWN_EMAIL_VERIFICATION=false ## Allow unknown email verification status (default false). Allowing this with SSO_SIGNUPS_MATCH_EMAIL open potential account takeover.
-#SSO_SCOPES= ##Optional, allow to override scopes if needed (default "email profile")
-#SSO_AUTHORIZE_EXTRA_PARAMS= ## Optional, allow to add extra parameter to the authorize redirection (default "")
-#SSO_PKCE=true ## Activate PKCE for the Auth Code flow (default true).
-#SSO_AUDIENCE_TRUSTED= ##Optional, Regex to trust additional audience for the IdToken (client_id is always trusted). Use single quote when writing the regex: '^$'.
-#SSO_MASTER_PASSWORD_POLICY ## Optional Master password policy (enforceOnLogin is not supported).
-#SSO_AUTH_ONLY_NOT_SESSION ## Enable to use SSO only for authentication not session lifecycle
-#SSO_CLIENT_CACHE_EXPIRATION=0 ## Cache calls to the discovery endpoint, duration in seconds, 0 to disable (default 0);
-#SSO_DEBUG_TOKENS=false ## Log all tokens for easier debugging (default false, LOG_LEVEL=debug or LOG_LEVEL=info,vaultwarden::sso=debug need to be set)
-
-## SSO Setup End ##
+# If SMTP isn't working, enable this line to debug
+#  remember to disable it after debugging
+#SMTP_DEBUG=true

compose.mariadb.yml

@@ -34,9 +34,9 @@ services:
         backupbot.restore.post-hook: 'mysql -u root -p"$$(cat /run/secrets/db_root_password)" $${MYSQL_DATABASE} < /var/lib/mysql/backup.sql'
     healthcheck:
       test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)"  ping']
-      interval: 30s
+      interval: 5s
       timeout: 10s
-      retries: 30
+      retries: 0
       start_period: 1m
 
 secrets:

compose.smtp.yml

@@ -13,6 +13,7 @@ services:
       - "SMTP_HOST"
       - "SMTP_PORT"
       - "SMTP_SECURITY"
+      - "SMTP_DEBUG"
 
 secrets:
   smtp_password:

compose.sso.yml

@@ -1,21 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - SSO_ENABLED
-      - SSO_AUTHORITY
-      - SSO_CLIENT_ID
-      - SSO_CLIENT_SECRET
-      - SSO_ONLY
-      - SSO_SIGNUPS_MATCH_EMAIL
-      - SSO_ALLOW_UNKNOWN_EMAIL_VERIFICATION
-      - SSO_SCOPES
-      - SSO_AUTHORIZE_EXTRA_PARAMS
-      - SSO_PKCE
-      - SSO_AUDIENCE_TRUSTED
-      - SSO_MASTER_PASSWORD_POLICY
-      - SSO_AUTH_ONLY_NOT_SESSION
-      - SSO_CLIENT_CACHE_EXPIRATION
-      - SSO_DEBUG_TOKENS

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: vaultwarden/server:1.35.2
+    image: vaultwarden/server:1.34.3
     networks:
       - proxy
       - internal
@@ -30,10 +30,9 @@ services:
       - vaultwarden_data:/data
     healthcheck:
       test: curl -f http://localhost/alive || exit 1
-      interval: 30s
-      timeout: 10s
-      retries: 30
-      start_period: 1m
+      interval: 5s
+      timeout: 3s
+      retries: 10
     deploy:
       restart_policy:
         condition: on-failure
@@ -43,7 +42,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=3.0.0+1.35.2"
+        - "coop-cloud.${STACK_NAME}.version=2.1.1+1.34.3"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/data"
 

release/3.0.0+1.35.2

@@ -1,4 +0,0 @@
-Allows support for 2026.1+ clients.
-
-This release includes options for SSO. Check out the release notes for
-more infomation.