From ca95209b4f1b461ae5c697d3eb40843bcbe841e7 Mon Sep 17 00:00:00 2001
From: stevensting <stefan@klasse-methode.it>
Date: Thu, 8 Oct 2026 14:51:42 +0200
Subject: [PATCH] separate smtp config

---
 .env.sample      |  2 ++
 compose.smtp.yml | 21 +++++++++++++++++++++
 compose.yml      | 12 ------------
 3 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 compose.smtp.yml

diff --git a/.env.sample b/.env.sample
index 8bd131d..2794225 100644
--- a/.env.sample
+++ b/.env.sample
@@ -6,10 +6,12 @@ DOMAIN=plausible.example.com
 #EXTRA_DOMAINS=', `www.plausible.example.com`'
 LETS_ENCRYPT_ENV=production
 #LOG_LEVEL=debug
+COMPOSE_FILE="compose.yml"
 
 DISABLE_REGISTRATION=true # true or false
 
 # Mail Configuration
+#COMPOSE_FILE="$COMPOSE_FILE:compose.mail.yml"
 #SECRET_SMTP_PASSWORD_VERSION=v1 # generate=false
 #MAILER_ADAPTER=Bamboo.Mua
 #MAILER_EMAIL=noreply@example.com
diff --git a/compose.smtp.yml b/compose.smtp.yml
new file mode 100644
index 0000000..a0cf4bd
--- /dev/null
+++ b/compose.smtp.yml
@@ -0,0 +1,21 @@
+---
+version: "3.8"
+
+services:
+  app:
+    environment:
+      - MAILER_ADAPTER
+      - SMTP_HOST_ADDR
+      - MAILER_EMAIL
+      - MAILER_NAME
+      - SMTP_HOST_PORT
+      - SMTP_USER_NAME
+      - SMTP_USER_PWD
+      - SMTP_HOST_SSL_ENABLED
+    secrets:
+      - smtp_password
+
+secrets:
+  smtp_password:
+    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
+    external: true
diff --git a/compose.yml b/compose.yml
index c3efbab..d894e85 100644
--- a/compose.yml
+++ b/compose.yml
@@ -13,20 +13,11 @@ services:
       - SECRET_KEY_BASE
       - DATABASE_URL=postgres://plausible:plausible@${STACK_NAME}_db:5432/plausible
       - CLICKHOUSE_DATABASE_URL=http://${STACK_NAME}_events:8123/plausible_events_db
-      - MAILER_ADAPTER
-      - SMTP_HOST_ADDR
-      - MAILER_EMAIL
-      - MAILER_NAME
-      - SMTP_HOST_PORT
-      - SMTP_USER_NAME
-      - SMTP_USER_PWD
-      - SMTP_HOST_SSL_ENABLED
       - DISABLE_REGISTRATION
       - LOG_LEVEL
     secrets:
       - totp_secret
       - key_base
-      - smtp_password
     configs:
       - source: plausible_entrypoint
         target: /plausible_entrypoint.sh
@@ -151,6 +142,3 @@ secrets:
   key_base:
     name: ${STACK_NAME}_key_base_${SECRET_KEY_BASE_VERSION}
     external: true
-  smtp_password:
-    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
-    external: true
-- 
2.54.0