env.template

@@ -8,8 +8,7 @@ ADMIN_USER=
 ADMIN_PASS=
 
 # used for sending notifications and reset passwords
-# only supports smtp+starttls
+SMTP_HOST=
-SMTP_ADDR=
+SMTP_PORT=
-SMTP_PORT=587
 SMTP_USER=
 SMTP_PASS=

scripts/ps

@@ -1,8 +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 \
-  --file services/git.yaml \
-  ps

scripts/pull

@@ -1,8 +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 \
-  --file services/git.yaml \
-  pull

services/auth.yaml

@@ -15,7 +15,7 @@ services:
 
   zitadel:
     restart: 'unless-stopped'
-    image: 'ghcr.io/zitadel/zitadel:v2.42.10'
+    image: 'ghcr.io/zitadel/zitadel:v2.24.10'
     environment:
       ZITADEL_DATABASE_COCKROACH_HOST: crdb
       ZITADEL_EXTERNALSECURE: true
@@ -26,7 +26,7 @@ services:
       ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: ${ADMIN_USER}
       ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: ${ADMIN_PASS}
 
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_HOST: "${SMTP_ADDR}:${SMTP_PORT}"
+      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

services/git.yaml

@@ -22,10 +22,10 @@ services:
       GITEA__database__USER: gitea
       GITEA__database__PASSWD__FILE: /run/secrets/DB_PASSWD
       GITEA__mailer__ENABLED: true
-      GITEA__mailer__FROM: gitea@mail.${DOMAIN}
+      GITEA__mailer__FROM: gitea
-      GITEA__mailer__PROTOCOL: smtp+starttls
+      GITEA__mailer__MAILER_TYPE: smtp
-      GITEA__mailer__SMTP_ADDR: ${SMTP_ADDR}
+      GITEA__mailer__HOST: ${SMTP_HOST}
-      GITEA__mailer__SMTP_PORT: ${SMTP_PORT}
+      GITEA__mailer__IS_TLS_ENABLED: true
       GITEA__mailer__USER: ${SMTP_USER}
       GITEA__mailer__PASSWD: ${SMTP_PASS}
     restart: unless-stopped

services/readme.md

@@ -16,9 +16,9 @@ we have a backup script that uses duplicity, this should be moved into a contain
 
 caddy is the web server, and handles https certificates, and proxying to all the services.
 
-#### [Zitadel](ihttps://zitadel.com/docs/self-hosting/deploy/overview)
+#### [Authelia](https://www.authelia.com/overview/prologue/introduction/) **WIP**
 
-zitadel lets you have a single username and password to sign on to all your services.
+authelia lets you have a single username and password to sign on to all your services.
 
 ### Optional Services