fix: fix some defaults and replace deprecated vars
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Robert Kaussow 2022-05-25 23:25:54 +02:00
parent c6113964ba
commit ee72579fca
Signed by: xoxys
GPG Key ID: 4E692A2EAECC03C0
2 changed files with 4 additions and 4 deletions

View File

@ -74,7 +74,7 @@ vaultwarden_healthcheck:
# @var vaultwarden_templates_folder: $ "_unset_" # @var vaultwarden_templates_folder: $ "_unset_"
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: "{{ vaultwarden_icon_cache_ttl }}" vaultwarden_icon_cache_negttl: "{{ vaultwarden_icon_cache_ttl }}"
@ -112,8 +112,8 @@ vaultwarden_org_attachment_limit: 1024
# @var vaultwarden_smtp_host: $ "_unset_" # @var vaultwarden_smtp_host: $ "_unset_"
vaultwarden_smtp_from: "vaultwarden@localhost" vaultwarden_smtp_from: "vaultwarden@localhost"
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
# @var vaultwarden_smtp_username: $ "_unset_" # @var vaultwarden_smtp_username: $ "_unset_"
# @var vaultwarden_smtp_password: $ "_unset_" # @var vaultwarden_smtp_password: $ "_unset_"
vaultwarden_smtp_auth_mechanism: plain vaultwarden_smtp_auth_mechanism: plain

View File

@ -73,7 +73,7 @@ services:
- VAULTWARDEN_SMTP_FROM={{ vaultwarden_smtp_from }} - VAULTWARDEN_SMTP_FROM={{ vaultwarden_smtp_from }}
- VAULTWARDEN_SMTP_FROM_NAME="{{ vaultwarden_smtp_from_name }}" - VAULTWARDEN_SMTP_FROM_NAME="{{ vaultwarden_smtp_from_name }}"
- VAULTWARDEN_SMTP_PORT={{ vaultwarden_smtp_port }} - VAULTWARDEN_SMTP_PORT={{ vaultwarden_smtp_port }}
- VAULTWARDEN_SMTP_SSL={{ vaultwarden_smtp_ssl }} - VAULTWARDEN_SMTP_SECURITY={{ vaultwarden_smtp_security }}
{% if vaultwarden_smtp_username is defined and vaultwarden_smtp_username %} {% if vaultwarden_smtp_username is defined and vaultwarden_smtp_username %}
- VAULTWARDEN_SMTP_USERNAME={{ vaultwarden_smtp_username }} - VAULTWARDEN_SMTP_USERNAME={{ vaultwarden_smtp_username }}
- VAULTWARDEN_SMTP_PASSWORD={{ vaultwarden_smtp_password }} - VAULTWARDEN_SMTP_PASSWORD={{ vaultwarden_smtp_password }}