fix: fix defaults and remove deprecated vars
All checks were successful
continuous-integration/drone/pr Build is passing

This commit is contained in:
Robert Kaussow 2022-05-25 23:19:26 +02:00
parent 0356f522be
commit 03b3294fca
Signed by: xoxys
GPG Key ID: 4E692A2EAECC03C0
2 changed files with 6 additions and 6 deletions

View File

@ -26,7 +26,7 @@ VAULTWARDEN_DATABASE_URL=
VAULTWARDEN_TEMPLATES_FOLDER= VAULTWARDEN_TEMPLATES_FOLDER=
VAULTWARDEN_RELOAD_TEMPLATES=False VAULTWARDEN_RELOAD_TEMPLATES=False
VAULTWARDEN_IP_HEADER=X-Client-IP VAULTWARDEN_IP_HEADER=X-Forwarded-For
VAULTWARDEN_ICON_CACHE_TTL=2592000 VAULTWARDEN_ICON_CACHE_TTL=2592000
VAULTWARDEN_ICON_CACHE_NEGTTL=259200 VAULTWARDEN_ICON_CACHE_NEGTTL=259200
@ -64,8 +64,8 @@ VAULTWARDEN_AUTHENTICATOR_DISABLE_TIME_DRIFT=False
VAULTWARDEN_SMTP_HOST= VAULTWARDEN_SMTP_HOST=
VAULTWARDEN_SMTP_FROM= VAULTWARDEN_SMTP_FROM=
VAULTWARDEN_SMTP_FROM_NAME=vaultwarden VAULTWARDEN_SMTP_FROM_NAME=vaultwarden
VAULTWARDEN_SMTP_PORT=587 VAULTWARDEN_SMTP_PORT=465
VAULTWARDEN_SMTP_SSL=True VAULTWARDEN_SMTP_SECURITY=force_tls
VAULTWARDEN_SMTP_USERNAME= VAULTWARDEN_SMTP_USERNAME=
VAULTWARDEN_SMTP_PASSWORD= VAULTWARDEN_SMTP_PASSWORD=
VAULTWARDEN_SMTP_AUTH_MECHANISM=Plain VAULTWARDEN_SMTP_AUTH_MECHANISM=Plain

View File

@ -16,7 +16,7 @@ TEMPLATES_FOLDER={{ getenv "VAULTWARDEN_TEMPLATES_FOLDER" }}
{{ end -}} {{ end -}}
RELOAD_TEMPLATES={{ getenv "VAULTWARDEN_RELOAD_TEMPLATES" "false" | conv.Bool }} 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_TTL={{ getenv "VAULTWARDEN_ICON_CACHE_TTL" "2592000" }}
ICON_CACHE_NEGTTL={{ getenv "VAULTWARDEN_ICON_CACHE_NEGTTL" "259200" }} 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_HOST={{ getenv "VAULTWARDEN_SMTP_HOST" }}
SMTP_FROM={{ getenv "VAULTWARDEN_SMTP_FROM" }} SMTP_FROM={{ getenv "VAULTWARDEN_SMTP_FROM" }}
SMTP_FROM_NAME={{ getenv "VAULTWARDEN_SMTP_FROM_NAME" "Vaultwarden" }} SMTP_FROM_NAME={{ getenv "VAULTWARDEN_SMTP_FROM_NAME" "Vaultwarden" }}
SMTP_PORT={{ getenv "VAULTWARDEN_SMTP_PORT" "587" }} SMTP_PORT={{ getenv "VAULTWARDEN_SMTP_PORT" "465" }}
SMTP_SSL={{ getenv "VAULTWARDEN_SMTP_SSL" "true" | conv.Bool }} SMTP_SECURITY={{ getenv "VAULTWARDEN_SMTP_SECURITY" "force_tls" }}
{{ if (getenv "VAULTWARDEN_SMTP_USERNAME") -}} {{ if (getenv "VAULTWARDEN_SMTP_USERNAME") -}}
SMTP_USERNAME={{ getenv "VAULTWARDEN_SMTP_USERNAME" }} SMTP_USERNAME={{ getenv "VAULTWARDEN_SMTP_USERNAME" }}
SMTP_PASSWORD={{ getenv "VAULTWARDEN_SMTP_PASSWORD" }} SMTP_PASSWORD={{ getenv "VAULTWARDEN_SMTP_PASSWORD" }}