From 03b3294fcac722d47b55350b03ad042ebcf95535 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 25 May 2022 23:19:26 +0200 Subject: [PATCH] fix: fix defaults and remove deprecated vars --- README.md | 6 +++--- overlay/etc/templates/env.tmpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d9cbf4a..352df54 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ VAULTWARDEN_DATABASE_URL= VAULTWARDEN_TEMPLATES_FOLDER= VAULTWARDEN_RELOAD_TEMPLATES=False -VAULTWARDEN_IP_HEADER=X-Client-IP +VAULTWARDEN_IP_HEADER=X-Forwarded-For VAULTWARDEN_ICON_CACHE_TTL=2592000 VAULTWARDEN_ICON_CACHE_NEGTTL=259200 @@ -64,8 +64,8 @@ VAULTWARDEN_AUTHENTICATOR_DISABLE_TIME_DRIFT=False VAULTWARDEN_SMTP_HOST= VAULTWARDEN_SMTP_FROM= VAULTWARDEN_SMTP_FROM_NAME=vaultwarden -VAULTWARDEN_SMTP_PORT=587 -VAULTWARDEN_SMTP_SSL=True +VAULTWARDEN_SMTP_PORT=465 +VAULTWARDEN_SMTP_SECURITY=force_tls VAULTWARDEN_SMTP_USERNAME= VAULTWARDEN_SMTP_PASSWORD= VAULTWARDEN_SMTP_AUTH_MECHANISM=Plain diff --git a/overlay/etc/templates/env.tmpl b/overlay/etc/templates/env.tmpl index f725fd3..5845962 100644 --- a/overlay/etc/templates/env.tmpl +++ b/overlay/etc/templates/env.tmpl @@ -16,7 +16,7 @@ TEMPLATES_FOLDER={{ getenv "VAULTWARDEN_TEMPLATES_FOLDER" }} {{ end -}} RELOAD_TEMPLATES={{ getenv "VAULTWARDEN_RELOAD_TEMPLATES" "false" | conv.Bool }} -IP_HEADER={{ getenv "VAULTWARDEN_IP_HEADER" "X-Client-IP" }} +IP_HEADER={{ getenv "VAULTWARDEN_IP_HEADER" "X-Forwarded-For" }} ICON_CACHE_TTL={{ getenv "VAULTWARDEN_ICON_CACHE_TTL" "2592000" }} ICON_CACHE_NEGTTL={{ getenv "VAULTWARDEN_ICON_CACHE_NEGTTL" "259200" }} @@ -74,8 +74,8 @@ ROCKET_WORKERS={{ getenv "VAULTWARDEN_ROCKET_WORKERS" }} SMTP_HOST={{ getenv "VAULTWARDEN_SMTP_HOST" }} SMTP_FROM={{ getenv "VAULTWARDEN_SMTP_FROM" }} SMTP_FROM_NAME={{ getenv "VAULTWARDEN_SMTP_FROM_NAME" "Vaultwarden" }} -SMTP_PORT={{ getenv "VAULTWARDEN_SMTP_PORT" "587" }} -SMTP_SSL={{ getenv "VAULTWARDEN_SMTP_SSL" "true" | conv.Bool }} +SMTP_PORT={{ getenv "VAULTWARDEN_SMTP_PORT" "465" }} +SMTP_SECURITY={{ getenv "VAULTWARDEN_SMTP_SECURITY" "force_tls" }} {{ if (getenv "VAULTWARDEN_SMTP_USERNAME") -}} SMTP_USERNAME={{ getenv "VAULTWARDEN_SMTP_USERNAME" }} SMTP_PASSWORD={{ getenv "VAULTWARDEN_SMTP_PASSWORD" }} -- 2.45.2