Merge branch 'develop' into dist/eole/2.7.0/develop
This commit is contained in:
commit
60148bfee4
|
@ -4,11 +4,11 @@ global:
|
||||||
%if %%tls_smtp == "non"
|
%if %%tls_smtp == "non"
|
||||||
smtp_smarthost: '%%exim_relay_smtp:25'
|
smtp_smarthost: '%%exim_relay_smtp:25'
|
||||||
%elif %%tls_smtp == "port 25"
|
%elif %%tls_smtp == "port 25"
|
||||||
smtp_smarthost: '%%exim_relay_smtp:25'
|
smtp_smarthost: '%%exim_relay_smtp:25'
|
||||||
smtp_require_tls: true
|
smtp_require_tls: true
|
||||||
%else
|
%else
|
||||||
smtp_smarthost: '%%exim_relay_smtp:465'
|
smtp_smarthost: '%%exim_relay_smtp:465'
|
||||||
smtp_require_tls: true
|
smtp_require_tls: true
|
||||||
%end if
|
%end if
|
||||||
smtp_from: '%%system_mail_from'
|
smtp_from: '%%system_mail_from'
|
||||||
%else
|
%else
|
||||||
|
|
Loading…
Reference in New Issue