From e44dca5a730d26a030fb1fd0f85a901fb866d458 Mon Sep 17 00:00:00 2001
From: Jonathan Dahan <git@jonathan.is>
Date: Wed, 8 Nov 2023 14:16:35 -0500
Subject: [PATCH] put env_file in the places that need it

---
 env.template         | 5 +++++
 scripts/down         | 2 +-
 scripts/run          | 2 +-
 scripts/up           | 2 +-
 services/auth.yaml   | 1 +
 services/backup.yaml | 2 ++
 services/mail.yaml   | 3 ++-
 7 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/env.template b/env.template
index 8b6e624..730699f 100644
--- a/env.template
+++ b/env.template
@@ -1,8 +1,13 @@
+# copy this to env and it will be sourced by the appropriate services 
+
+# domain your services will be running on
 DOMAIN=localhost
 
+# admin user for auth
 ADMIN_USER=
 ADMIN_PASS=
 
+# used for sending notifications and reset passwords
 SMTP_HOST=
 SMTP_PORT=
 SMTP_USER=
diff --git a/scripts/down b/scripts/down
index f88a9ef..1d27e3a 100755
--- a/scripts/down
+++ b/scripts/down
@@ -1,4 +1,4 @@
-podman compose --env-file env.production \
+podman compose \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \
diff --git a/scripts/run b/scripts/run
index e4cd1df..4df6732 100755
--- a/scripts/run
+++ b/scripts/run
@@ -1,4 +1,4 @@
-podman compose --env-file env.production \
+podman compose \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \
diff --git a/scripts/up b/scripts/up
index aa0e61f..95fd408 100755
--- a/scripts/up
+++ b/scripts/up
@@ -1,4 +1,4 @@
-podman compose --env-file env.production \
+podman compose \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \
diff --git a/services/auth.yaml b/services/auth.yaml
index 494e6ef..e650254 100644
--- a/services/auth.yaml
+++ b/services/auth.yaml
@@ -16,6 +16,7 @@ services:
   zitadel:
     restart: 'unless-stopped'
     image: 'ghcr.io/zitadel/zitadel:latest'
+    env_file: ../env
     environment:
       ZITADEL_DATABASE_COCKROACH_HOST: crdb
       ZITADEL_EXTERNALSECURE: true
diff --git a/services/backup.yaml b/services/backup.yaml
index 78d785f..b3c6d18 100644
--- a/services/backup.yaml
+++ b/services/backup.yaml
@@ -18,6 +18,7 @@ services:
       generate-secrets:
         condition: 'service_completed_successfully'
     secrets: [B2_APPLICATION_KEY, B2_APPLICATION_KEY_ID, BUCKET_NAME, PASSPHRASE]
+    env_file: ../env
     environment:
       HOSTNAME: ${DOMAIN}
       TZ: America/New_York
@@ -36,6 +37,7 @@ services:
 #    restart: unless-stopped
 #    depends_on: [secrets]
 #    secrets: [B2_APPLICATION_KEY, B2_APPLICATION_KEY_ID, BUCKET_NAME, PASSPHRASE]
+#    env_file: ../env
 #    environment:
 #      HOSTNAME: ${DOMAIN}
 #      TZ: America/New_York
diff --git a/services/mail.yaml b/services/mail.yaml
index 4e01def..95c1211 100644
--- a/services/mail.yaml
+++ b/services/mail.yaml
@@ -24,7 +24,7 @@ services:
     depends_on:
       generate-secrets:
         condition: 'service_completed_successfully'
-
+    env_file: ../env
     environment:
       - MADDY_HOSTNAME=mx.mail.${DOMAIN}
       - MADDY_DOMAIN=mail.${DOMAIN}
@@ -41,6 +41,7 @@ services:
 
   roundcube:
     image: roundcube/roundcubemail:1.6.x-apache
+    env_file: ../env
     environment:
       ROUNDCUBEMAIL_DEFAULT_HOST: ssl://mx.mail.${DOMAIN}
       ROUNDCUBEMAIL_DEFAULT_PORT: 993