From ee72579fcadfa8f470898739f66352c8a7892794 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 25 May 2022 23:25:54 +0200 Subject: [PATCH] fix: fix some defaults and replace deprecated vars --- defaults/main.yml | 6 +++--- templates/services/vaultwarden_compose.yml.j2 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 46372b7..69c0e2a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -74,7 +74,7 @@ vaultwarden_healthcheck: # @var vaultwarden_templates_folder: $ "_unset_" 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: "{{ vaultwarden_icon_cache_ttl }}" @@ -112,8 +112,8 @@ vaultwarden_org_attachment_limit: 1024 # @var vaultwarden_smtp_host: $ "_unset_" vaultwarden_smtp_from: "vaultwarden@localhost" vaultwarden_smtp_from_name: "Vaultwarden" -vaultwarden_smtp_port: 587 -vaultwarden_smtp_ssl: True +vaultwarden_smtp_port: 465 +vaultwarden_smtp_security: force_tls # @var vaultwarden_smtp_username: $ "_unset_" # @var vaultwarden_smtp_password: $ "_unset_" vaultwarden_smtp_auth_mechanism: plain diff --git a/templates/services/vaultwarden_compose.yml.j2 b/templates/services/vaultwarden_compose.yml.j2 index 1114efa..56c54e6 100644 --- a/templates/services/vaultwarden_compose.yml.j2 +++ b/templates/services/vaultwarden_compose.yml.j2 @@ -73,7 +73,7 @@ services: - VAULTWARDEN_SMTP_FROM={{ vaultwarden_smtp_from }} - VAULTWARDEN_SMTP_FROM_NAME="{{ vaultwarden_smtp_from_name }}" - 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 %} - VAULTWARDEN_SMTP_USERNAME={{ vaultwarden_smtp_username }} - VAULTWARDEN_SMTP_PASSWORD={{ vaultwarden_smtp_password }}