services/authelia.yaml

@@ -11,6 +11,12 @@ secrets:
     file: ../secrets/authelia/STORAGE_ENCRYPTION_KEY
   SMTP_PASSWORD:
     file: ../secrets/smtp/SMTP_PASSWORD
+  SMTP_HOST:
+    file: ../secrets/smtp/SMTP_HOST
+  SMTP_PORT:
+    file: ../secrets/smtp/SMTP_PORT
+  SMTP_USERNAME:
+    file: ../secrets/smtp/SMTP_USERNAME
 
 services:
   authelia:
@@ -25,16 +31,15 @@ services:
     restart: unless-stopped
     expose:
       - 9091
-    secrets: [JWT_SECRET, SESSION_SECRET, STORAGE_PASSWORD, STORAGE_ENCRYPTION_KEY, SMTP_PASSWORD]
+    secrets: [JWT_SECRET, SESSION_SECRET, STORAGE_PASSWORD, STORAGE_ENCRYPTION_KEY, SMTP_PASSWORD, SMTP_HOST, SMTP_PORT, SMTP_USERNAME]
     environment:
       AUTHELIA_JWT_SECRET_FILE: /run/secrets/JWT_SECRET
-      AUTHELIA_SESSION_DOMAIN: ${DOMAIN}
       AUTHELIA_SESSION_SECRET_FILE: /run/secrets/SESSION_SECRET
       AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE: /run/secrets/STORAGE_ENCRYPTION_KEY
 
       AUTHELIA_STORAGE_POSTGRES_DATABASE: authelia
-      AUTHELIA_STORAGE_POSTGRES_HOST: postgres
-      AUTHELIA_STORAGE_POSTGRES_USERNAME: authelia
+      AUTHELIA_STORAGE_POSTGRES_ADDRESS: postgres
+      AUTHELIA_STORAGE_POSTGRES_USERNAME_FILE: /run/secrets/SMTP_USERNAME
       AUTHELIA_STORAGE_POSTGRES_PASSWORD_FILE: /run/secrets/STORAGE_PASSWORD
 
       AUTHELIA_DEFAULT_REDIRECTION_URL: https://${DOMAIN}
@@ -44,10 +49,10 @@ services:
       AUTHELIA_ACCESS_CONTROL_DEFAULT_POLICY: two_factor
 
       AUTHELIA_NOTIFIER_SMTP_PASSWORD_FILE: /run/secrets/SMTP_PASSWORD
-      AUTHELIA_NOTIFIER_SMTP_HOST: ${SMTP_HOST}
-      AUTHELIA_NOTIFIER_SMTP_PORT: ${SMTP_PORT}
-      AUTHELIA_NOTIFIER_SMTP_USERNAME: ${SMTP_USERNAME}
-      AUTHELIA_NOTIFIER_SMTP_SENDER: "Woodbine <${SMTP_USERNAME}@${DOMAIN}>"
+      AUTHELIA_NOTIFIER_SMTP_HOST_FILE: /run/secrets/SMTP_HOST
+      AUTHELIA_NOTIFIER_SMTP_PORT_FILE: /run/secrets/SMTP_PORT
+      AUTHELIA_NOTIFIER_SMTP_USERNAME: "authelia@${DOMAIN}"
+      AUTHELIA_NOTIFIER_SMTP_SENDER: "Authelia <authelia@${DOMAIN}>"
 
     volumes:
       - ../data/authelia/config:/config

services/backup.yaml

@@ -22,7 +22,7 @@ services:
       TZ: America/New_York
     volumes:
       - ./backup/backup-files:/backup-files:ro
-    entrypoint: ["/bin/sh", "/backup-files"]
+    entrypoint: ["/backup-files"]
 
 #  backup-postgres:
 #    container_name: backup-postgres

services/smtp.yaml

@@ -1,13 +1,19 @@
 version: "3.8"
 
 secrets:
+  SMTP_HOST:
+    file: ../secrets/smtp/SMTP_HOST
+  SMTP_PORT:
+    file: ../secrets/smtp/SMTP_PORT
+  SMTP_USERNAME:
+    file: ../secrets/smtp/SMTP_USERNAME
   SMTP_PASSWORD:
     file: ../secrets/smtp/SMTP_PASSWORD
 
 services:
   smtp:
     image: foxcpp/maddy:0.6
-    secrets: [SMTP_PASSWORD]
+    secrets: ["SMTP_HOST", "SMTP_PORT", "SMTP_USERNAME", "SMTP_PASSWORD"]
     restart: unless-stopped
     depends_on: ["smtp-setup"]
     environment:
@@ -28,7 +34,7 @@ services:
     container_name: smtp-setup
     image: alpine
     restart: no
-    secrets: [SMTP_PASSWORD]
+    secrets: ["SMTP_HOST", "SMTP_PORT", "SMTP_USERNAME", "SMTP_PASSWORD"]
     volumes:
       - ./secrets/check-secrets:/check-secrets:ro
     entrypoint: ["/check-secrets"]