fix smtp.yml and add smtp options

chore: publish 1.2.0+0.24.6 release
fix traefik labels for v3 traefik
2026-01-06 18:29:25 +01:00 · 2025-10-09 16:10:30 +02:00 · 2025-10-09 16:00:57 +02:00 · 2025-09-09 13:03:27 +00:00 · 2025-09-09 11:59:11 +00:00 · 2025-05-08 14:44:10 +02:00
6 changed files with 28 additions and 21 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -17,8 +17,9 @@ steps:
      DOMAIN: authentik.swarm-test.autonomic.zone
      STACK_NAME: authentik
      LETS_ENCRYPT_ENV: production
-      CONFIG_YML_VERSION: v1
+      CONFIG_YML_VERSION: v9
      HEALTHCHECK_VERSION: v1
+      PG_BACKUP_VERSION: v2
      SECRET_DB_PASSWORD_VERSION: v1
      SECRET_JWT_SECRET_VERSION: v1

@ -37,8 +38,7 @@ steps:
        from_secret: drone_abra-bot_token
      fork: true
      repositories:
-        - coop-cloud/auto-recipes-catalogue-json
+        - toolshed/auto-recipes-catalogue-json

 trigger:
  event: tag
-
--- a/.env.sample
+++ b/.env.sample
@ -7,6 +7,7 @@ DOMAIN=vikunja.example.com

 ## Domain aliases
 #EXTRA_DOMAINS=', `www.vikunja.example.com`'
+#REDIRECT_DOMAIN=www.vikunja.example.com

 LETS_ENCRYPT_ENV=production

@ -41,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
--- a/abra.sh
+++ b/abra.sh
@ -1,3 +1,3 @@
-export CONFIG_YML_VERSION=v8
+export CONFIG_YML_VERSION=v9
 export HEALTHCHECK_VERSION=v1
 export PG_BACKUP_VERSION=v2
--- a/compose.smtp.yml
+++ b/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
--- a/compose.yml
+++ b/compose.yml
@ -3,7 +3,7 @@ version: "3.8"

 services:
  app:
-    image: vikunja/vikunja:0.24.2
+    image: vikunja/vikunja:0.24.6
    environment:
      - DOMAIN
      - LOG_LEVEL
@ -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
@ -50,15 +44,18 @@ services:
      - source: healthcheck
        target: /healthcheck
        mode: 555
-
    deploy:
      labels:
        - "traefik.enable=true"
+        - "traefik.docker.network=proxy"
        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3456"
-        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
+        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.regex=^https://${REDIRECT_DOMAIN:-example.com}(.*)"
+        - "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.0.3+0.24.2"
+        - "coop-cloud.${STACK_NAME}.version=1.2.0+0.24.6"
        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
    healthcheck:
      test: [ "CMD", "/healthcheck"]
@ -68,7 +65,7 @@ services:
      start_period: 1m

  redis:
-    image: redis:7.4.1-alpine
+    image: redis:8.2.2-alpine
    networks:
      - internal

--- a/config.yml.tmpl
+++ b/config.yml.tmpl
@ -5,8 +5,10 @@ service:
  JWTSecret: {{ secret "jwt_secret" }}
 database:
  password: "{{ secret "db_password" }}"
+{{ if eq (env "VIKUNJA_MAILER_ENABLED") "true" }}
 mailer:
  password: {{ secret "smtp_password" }}
+{{ end }}
 {{ if eq (env "OAUTH_ENABLED") "true" }}
 auth:
  openid:
Author	SHA1	Message	Date
Apfelwurm	8257abec54	fix smtp.yml and add smtp options	2026-01-06 18:29:25 +01:00
Simon	5958c4c3fe	chore: publish 1.2.0+0.24.6 release All checks were successful continuous-integration/drone/tag Build is passing Details continuous-integration/drone/push Build is passing Details	2025-10-09 16:10:30 +02:00
Simon	49ab93c503	fix traefik labels for v3 traefik All checks were successful continuous-integration/drone/push Build is passing Details	2025-10-09 16:00:57 +02:00
simon	f418cd1a40	Merge pull request 'fix: only set smtp secret when mailer is configured' (#3 ) from kolaente/coop-cloud-vikunja:fix/mailer into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #3 Reviewed-by: simon <simon@noreply.git.coopcloud.tech>	2025-09-09 13:03:27 +00:00
kolaente	bd5545b614	fix: only set smtp secret when mailer is configured This fixes a bug where Vikunja would not start because the smtp secret was not set. It would show nothing in the logs but `docker inspect` on the host yields ``` "unable to get config from config store: failed to expand templated config cghsr0po6tijn4wuah8zulg48: template: expansion:9:15: executing \"expansion\" at <secret \"smtp_password\">: error calling secret: secret target smtp_password not found", ``` This change fixes that by checking if the mailer is enabled.	2025-09-09 11:59:11 +00:00
3wc	0a6f397f4b	Add CI and catalogue generation [mass update] All checks were successful continuous-integration/drone/push Build is passing Details	2025-05-08 14:44:10 +02:00
Moritz	ba78d79998	chore: publish 1.1.1+0.24.6 release All checks were successful continuous-integration/drone/tag Build is passing Details continuous-integration/drone/push Build is passing Details	2025-02-04 18:51:07 +01:00
Cassowary	5637a59368	chore: publish 1.1.0+0.24.6 release All checks were successful continuous-integration/drone/tag Build is passing Details continuous-integration/drone/push Build is passing Details	2025-01-19 10:28:23 -08:00
Cassowary	e039b08ff0	Update .drone.yml All checks were successful continuous-integration/drone/push Build is passing Details	2025-01-08 10:09:13 -08:00
Moritz	db3edafbee	add REDIRECT_DOMAIN All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-26 00:06:03 +02:00
Moritz	ce8c3eec63	add EXTRA_DOMAINS env All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-25 22:43:56 +02:00
Moritz	c4a74a817a	fix drone runner All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-25 22:13:55 +02:00