From 01fdacae52cd21b95c3e1bf97bc66c03b882b672 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Tue, 22 Apr 2025 23:48:12 +0200
Subject: [PATCH] fix: don't enable SMTP by default

See https://git.coopcloud.tech/coop-cloud/vaultwarden/issues/8
---
 .env.sample          | 1 +
 abra.sh              | 3 ++-
 compose.yml          | 2 +-
 entrypoint.sh.tmpl   | 3 +++
 release/1.2.0+1.33.2 | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 release/1.2.0+1.33.2

diff --git a/.env.sample b/.env.sample
index 4b49339..16dde98 100644
--- a/.env.sample
+++ b/.env.sample
@@ -25,6 +25,7 @@ TX="Europe/Berlin"
 ## SMTP settings
 #COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 #SECRET_SMTP_PASSWORD_VERSION=v1
+#SMTP_ENABLED=1
 #SMTP_FROM=noreply@example.com
 #SMTP_USERNAME=noreply@example.com
 #SMTP_HOST=mail.example.com
diff --git a/abra.sh b/abra.sh
index be1f878..feb8e61 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,5 @@
-export APP_ENTRYPOINT_VERSION=v3
+export APP_ENTRYPOINT_VERSION=v4
+
 APP_DIR="app:/data"
 
 insert_vaultwarden_admin_token() {
diff --git a/compose.yml b/compose.yml
index 19b8fbe..b437072 100644
--- a/compose.yml
+++ b/compose.yml
@@ -42,7 +42,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=1.1.0+1.33.2"
+        - "coop-cloud.${STACK_NAME}.version=1.2.0+1.33.2"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/data"
 
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index 2be7858..81017d7 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -46,7 +46,10 @@ if [ -n "${MYSQL_HOST}" ]; then
 fi
 
 file_env "ADMIN_TOKEN"
+
+{{ if eq (env "SMTP_ENABLED") "1" }}
 file_env "SMTP_PASSWORD"
+{{ end }}
 
 # upstream startup command
 # https://github.com/dani-garcia/vaultwarden/blob/60ed5ff99d15dec0b82c85987f9a3e244b8bde91/docker/Dockerfile.j2#L254
diff --git a/release/1.2.0+1.33.2 b/release/1.2.0+1.33.2
new file mode 100644
index 0000000..474b2fa
--- /dev/null
+++ b/release/1.2.0+1.33.2
@@ -0,0 +1 @@
+Please add `SMTP_ENABLED=1` to your .env if you're using SMTP.