Merge branch 'master' into AddSSLSupport

This commit is contained in:
Aeva 2019-07-24 13:22:21 -07:00 committed by GitHub
commit 6f93938c48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 42 additions and 24 deletions

View file

@ -50,10 +50,10 @@ xpack.notification.email:
auth: {{ es_mail_config['require_auth'] }}
host: {{ es_mail_config['host'] }}
port: {{ es_mail_config['port'] }}
{% if es_mail_config['require_auth'] == true %}
{% if es_mail_config['require_auth'] == true -%}
user: {{ es_mail_config['user'] }}
password: {{ es_mail_config['pass'] }}
{% endif %}
{%- endif %}
{% endif %}
{% if es_enable_http_ssl | bool %}