Merge branch 'master' into dist/eole/2.6.2/master

This commit is contained in:
Philippe Caseiro 2018-06-06 14:39:46 +02:00
commit 39e1ed720d
1 changed files with 3 additions and 1 deletions

View File

@ -6,11 +6,13 @@ global:
smtp_auth_username: '%%alSMTPUser'
smtp_auth_password: 'alSMTPPass'
%end if
%ïf %%getVar('alSMTPTLS','non') == 'oui'
%if %%getVar('alSMTPTLS','non') == 'oui'
smtp_require_tls: true
%else
smtp_require_tls: false
%end if
# The auth token for Hipchat.
#hipchat_auth_token: '1234556789'
# Alternative host for Hipchat.