chore: publish 1.3.0+0.24.6 release

Adds all the smtp options, and moves the env variables to the right compose file

Reviewed-on: #5
Reviewed-by: kolaente <coopcloud-git@kolaente.de>
Co-authored-by: Apfelwurm <Alexander@volzit.de>
Co-committed-by: Apfelwurm <Alexander@volzit.de>

.env.sample

@@ -42,7 +42,10 @@ VIKUNJA_AUTH_LOCAL_ENABLED=false
 # COMPOSE_FILE="${COMPOSE_FILE}:compose.smtp.yml"
 # VIKUNJA_MAILER_ENABLED=true
 # VIKUNJA_MAILER_HOST=mail.example.com
+# VIKUNJA_MAILER_PORT=25
 # VIKUNJA_MAILER_AUTHTYPE=plain # possible: plain, login, cram-md5
 # VIKUNJA_MAILER_USERNAME=user
 # VIKUNJA_MAILER_FROMEMAIL=user@example.com
-# SECRET_SMTP_PASSWORD_VERSION=v1
+# VIKUNJA_MAILER_SKIPTLSVERIFY=false
+# VIKUNJA_MAILER_FORCESSL=false
+# SECRET_SMTP_PASSWORD_VERSION=v1

compose.smtp.yml

@@ -3,11 +3,15 @@ version: "3.8"
 services:
   app:
     environment:
-      - SMTP_ENABLED
-      - SMTP_HOST
-      - SMTP_AUTHTYPE
-      - SMTP_USER
-      - SMTP_FROM_EMAIL
+      - VIKUNJA_MAILER_ENABLED
+      - VIKUNJA_MAILER_HOST
+      - VIKUNJA_MAILER_PORT
+      - VIKUNJA_MAILER_AUTHTYPE
+      - VIKUNJA_MAILER_SKIPTLSVERIFY
+      - VIKUNJA_MAILER_FORCESSL
+      - VIKUNJA_MAILER_USERNAME
+      - VIKUNJA_MAILER_PASSWORD_FILE=/run/secrets/smtp_password
+      - VIKUNJA_MAILER_FROMEMAIL
       
     secrets:
       - smtp_password

compose.yml

@@ -21,12 +21,6 @@ services:
       - VIKUNJA_CACHE_TYPE=redis
       - VIKUNJA_SERVICE_ENABLEREGISTRATION=false
       - VIKUNJA_SERVICE_JWTTTL=604800
-      - VIKUNJA_MAILER_ENABLED
-      - VIKUNJA_MAILER_HOST
-      - VIKUNJA_MAILER_AUTHTYPE
-      - VIKUNJA_MAILER_USERNAME
-      - VIKUNJA_MAILER_PASSWORD_FILE=/run/secrets/smtp_password
-      - VIKUNJA_MAILER_FROMEMAIL
       - VIKUNJA_LOG_LEVEL
       - VIKUNJA_LOG_DATABASE
       - VIKUNJA_LOG_DATABASELEVEL
@@ -61,13 +55,13 @@ services:
         - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}$${1}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=1.2.0+0.24.6"
+        - "coop-cloud.${STACK_NAME}.version=1.3.0+0.24.6"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
     healthcheck:
       test: [ "CMD", "/healthcheck"]
       interval: 30s
       timeout: 10s
-      retries: 10
+      retries: 30
       start_period: 1m
 
   redis:
@@ -85,7 +79,10 @@ services:
       - db:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -h localhost -U $$POSTGRES_USER"]
-      interval: 2s
+      interval: 10s
+      timeout: 10s
+      retries: 30
+      start_period: 1m
     networks:
       - internal
     secrets:

release/1.3.0+0.24.6

@@ -0,0 +1 @@
+add missing smtp options and increase healthcheck retries