env.template

@@ -1,14 +1,5 @@
-# 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
+SMTP_USER=admin
-ADMIN_USER=
+SMTP_HOST=localhost
-ADMIN_PASS=
+SMTP_PORT=587
-
-# used for sending notifications and reset passwords
-SMTP_HOST=
-SMTP_PORT=
-SMTP_USER=
-SMTP_PASS=

scripts/down

@@ -1,4 +1,4 @@
-podman compose \
+podman compose --env-file env.production \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \

scripts/run

@@ -1,4 +1,4 @@
-podman compose \
+podman compose --env-file env.production \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \

scripts/up

@@ -1,4 +1,4 @@
-podman compose \
+podman compose --env-file env.production \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \

services/auth.yaml

@@ -16,7 +16,6 @@ services:
   zitadel:
     restart: 'unless-stopped'
     image: 'ghcr.io/zitadel/zitadel:latest'
-    env_file: ../env
     environment:
       ZITADEL_DATABASE_COCKROACH_HOST: crdb
       ZITADEL_EXTERNALSECURE: true

services/backup.yaml

@@ -18,7 +18,6 @@ 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
@@ -37,7 +36,6 @@ 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

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,7 +41,6 @@ services:
 
   roundcube:
     image: roundcube/roundcubemail:1.6.x-apache
-    env_file: ../env
     environment:
       ROUNDCUBEMAIL_DEFAULT_HOST: ssl://mx.mail.${DOMAIN}
       ROUNDCUBEMAIL_DEFAULT_PORT: 993