env.template

@@ -1,4 +1,4 @@
-# copy this to .env and it will be sourced by the appropriate services 
+# copy this to env and it will be sourced by the appropriate services 
 
 # domain your services will be running on
 DOMAIN=localhost

scripts/down

@@ -1,4 +1,4 @@
-podman compose --env-file ${ENV_FILE:-.env} \
+podman compose \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \

scripts/exec

@@ -1,7 +0,0 @@
-podman compose --env-file ${ENV_FILE:-.env} \
-  --file services/secrets.yaml \
-  --file services/backup.yaml  \
-  --file services/proxy.yaml \
-  --file services/auth.yaml \
-  --file services/web.yaml \
-  exec "$@"

scripts/run

@@ -1,4 +1,4 @@
-podman compose --env-file ${ENV_FILE:-.env} \
+podman compose \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \

scripts/up

@@ -1,4 +1,4 @@
-podman compose --env-file ${ENV_FILE:-.env} \
+podman compose \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \

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
@@ -25,15 +26,11 @@ services:
       ZITADEL_FIRSTINSTANCE_ORG_NAME: basement
       ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: ${ADMIN_USER}
       ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: ${ADMIN_PASS}
-
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROM: basement
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROMNAME: ${DOMAIN}
       ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_HOST: "${SMTP_HOST}:${SMTP_PORT}"
       ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_USER: ${SMTP_USER}
       ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_PASSWORD: ${SMTP_PASS}
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_SSL: true
-
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROM: basement@mail.${DOMAIN}
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROMNAME: basement
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_REPLYTOADDRESS: basement@mail.${DOMAIN}
     secrets:
       - MASTER_KEY
     command: "start-from-init --masterkeyFile /run/secrets/MASTER_KEY --tlsMode external"

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

services/mail.yaml

@@ -24,6 +24,7 @@ services:
     depends_on:
       generate-secrets:
         condition: 'service_completed_successfully'
+    env_file: ../env
     environment:
       - MADDY_HOSTNAME=mx.mail.${DOMAIN}
       - MADDY_DOMAIN=mail.${DOMAIN}
@@ -40,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