From 964c06895b1d3790be3f2a636ebce7de9c33d52c Mon Sep 17 00:00:00 2001
From: Jonathan Dahan <git@jonathan.is>
Date: Fri, 3 Nov 2023 15:43:27 -0400
Subject: [PATCH] set SMTP variables in env

---
 services/authelia.yaml | 20 +++++++-------------
 services/backup.yaml   |  2 +-
 services/smtp.yaml     | 10 ++--------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/services/authelia.yaml b/services/authelia.yaml
index 2cfad5a..9e08940 100644
--- a/services/authelia.yaml
+++ b/services/authelia.yaml
@@ -11,12 +11,6 @@ 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:
@@ -31,14 +25,15 @@ services:
     restart: unless-stopped
     expose:
       - 9091
-    secrets: [JWT_SECRET, SESSION_SECRET, STORAGE_PASSWORD, STORAGE_ENCRYPTION_KEY, SMTP_PASSWORD, SMTP_HOST, SMTP_PORT, SMTP_USERNAME]
+    secrets: [JWT_SECRET, SESSION_SECRET, STORAGE_PASSWORD, STORAGE_ENCRYPTION_KEY, SMTP_PASSWORD]
     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_ADDRESS: postgres
+      AUTHELIA_STORAGE_POSTGRES_HOST: postgres
       AUTHELIA_STORAGE_POSTGRES_USERNAME: authelia
       AUTHELIA_STORAGE_POSTGRES_PASSWORD_FILE: /run/secrets/STORAGE_PASSWORD
 
@@ -48,12 +43,11 @@ services:
 
       AUTHELIA_ACCESS_CONTROL_DEFAULT_POLICY: two_factor
 
-      AUTHELIA_NOTIFIER: smtp
       AUTHELIA_NOTIFIER_SMTP_PASSWORD_FILE: /run/secrets/SMTP_PASSWORD
-      AUTHELIA_NOTIFIER_SMTP_HOST_FILE: /run/secrets/SMTP_HOST
-      AUTHELIA_NOTIFIER_SMTP_PORT_FILE: /run/secrets/SMTP_PORT
-      AUTHELIA_NOTIFIER_SMTP_USERNAME_FILE: /run/secrets/SMTP_USERNAME
-      AUTHELIA_NOTIFIER_SMTP_SENDER: "Authelia <authelia@${DOMAIN}>"
+      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}>"
 
     volumes:
       - ../data/authelia/config:/config
diff --git a/services/backup.yaml b/services/backup.yaml
index a248bd1..bfa951c 100644
--- a/services/backup.yaml
+++ b/services/backup.yaml
@@ -22,7 +22,7 @@ services:
       TZ: America/New_York
     volumes:
       - ./backup/backup-files:/backup-files:ro
-    entrypoint: ["/backup-files"]
+    entrypoint: ["/bin/sh", "/backup-files"]
 
 #  backup-postgres:
 #    container_name: backup-postgres
diff --git a/services/smtp.yaml b/services/smtp.yaml
index b0e55c9..2e4b545 100644
--- a/services/smtp.yaml
+++ b/services/smtp.yaml
@@ -1,19 +1,13 @@
 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_HOST", "SMTP_PORT", "SMTP_USERNAME", "SMTP_PASSWORD"]
+    secrets: [SMTP_PASSWORD]
     restart: unless-stopped
     depends_on: ["smtp-setup"]
     environment:
@@ -34,7 +28,7 @@ services:
     container_name: smtp-setup
     image: alpine
     restart: no
-    secrets: ["SMTP_HOST", "SMTP_PORT", "SMTP_USERNAME", "SMTP_PASSWORD"]
+    secrets: [SMTP_PASSWORD]
     volumes:
       - ./secrets/check-secrets:/check-secrets:ro
     entrypoint: ["/check-secrets"]