chore: publish 2.1.1+1.34.3 release

Reviewed-on: #11

.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

abra.sh

@@ -3,7 +3,9 @@ APP_DIR="app:/data"
 
 insert_vaultwarden_admin_token() {
   if ! command -v argon2 &> /dev/null; then
-    echo "argon2 could not be found, please install it to proceed."
+    echo "argon2 is required on your local machine to hash the admin token."
+    echo "It could not be found in your PATH, please install argon2 to proceed."
+    echo "For example: On a debian/ubuntu system, run `apt install argon2`"
     exit 1
   fi
   PASS=$(openssl rand 64 | openssl enc -A -base64)

compose.mariadb.yml

@@ -13,7 +13,7 @@ services:
       - db_password
 
   db:
-    image: "mariadb:10.6" # or "mysql"
+    image: "mariadb:10.11" # or "mysql"
     environment:
       - MYSQL_DATABASE=vaultwarden
       - MYSQL_USER=vaultwarden

compose.smtp.yml

@@ -6,6 +6,7 @@ services:
     secrets:
       - smtp_password
     environment:
+      - "SMTP_ENABLED"
       - "SMTP_PASSWORD_FILE=/run/secrets/smtp_password"
       - "SMTP_FROM"
       - "SMTP_USERNAME"

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: vaultwarden/server:1.33.2
+    image: vaultwarden/server:1.34.3
     networks:
       - proxy
       - internal
@@ -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=2.1.1+1.34.3"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/data"
 

entrypoint.sh.tmpl

@@ -47,7 +47,10 @@ if [ -n "${MYSQL_HOST}" ]; then
 fi
 
 file_env "ADMIN_TOKEN"
+
+{{ if eq (env "SMTP_ENABLED") "1" }}
 file_env "SMTP_PASSWORD"
+{{ end }}
 
 # remove world permissions on data
 chmod -R o= /data

release/2.0.0+1.33.2

@@ -0,0 +1,15 @@
+=== SMTP SETTINGS ===
+This release contains a *breaking change* if you use SMTP with vaultwarden.
+
+See https://git.coopcloud.tech/coop-cloud/vaultwarden/pulls/9 for more.
+
+TLDR; Please add `SMTP_ENABLED=1` to your .env to continue using SMTP.
+
+=== PERMISSIONS ===
+
+Previously, the data directory including the main private key had read
+permissions enabled for all host users. This release fixes that. Please review
+your Vaultwarden keys if other users on your Co-op Cloud host may have had
+access to these files.
+
+See https://git.coopcloud.tech/coop-cloud/vaultwarden/pulls/7 for more.