diff options
Diffstat (limited to 'roles/mtaserver/templates/main.cf.j2')
| -rw-r--r-- | roles/mtaserver/templates/main.cf.j2 | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/roles/mtaserver/templates/main.cf.j2 b/roles/mtaserver/templates/main.cf.j2 index b3ed7ba..7a3a0a2 100644 --- a/roles/mtaserver/templates/main.cf.j2 +++ b/roles/mtaserver/templates/main.cf.j2 @@ -93,15 +93,13 @@ mail_owner = postfix # #myhostname = host.domain.tld #myhostname = virtual.domain.tld -{% if is_mtamaster is defined %} -myhostname = mail.casperlefantom.net -{% else %} -{% if ansible_default_ipv4.network == "192.168.0.0" or ansible_default_ipv4.network == "10.42.0.0" %} +{% if mtadomain is defined %} +myhostname = mail.{{ mtadomain.0 }} +{% elif ansible_default_ipv4.network == localnet %} myhostname = {{ ansible_hostname }}.home.casperlefantom.net {% else %} myhostname = {{ ansible_hostname }}.casperlefantom.net {% endif %} -{% endif %} # The mydomain parameter specifies the local internet domain name. # The default is to use $myhostname minus the first component. @@ -109,15 +107,13 @@ myhostname = {{ ansible_hostname }}.casperlefantom.net # parameters. # #mydomain = domain.tld -{% if is_mtamaster is defined %} -mydomain = casperlefantom.net -{% else %} -{% if ansible_default_ipv4.network == "192.168.0.0" or ansible_default_ipv4.network == "10.42.0.0" %} +{% if mtadomain is defined %} +mydomain = {{ mtadomain.0 }} +{% elif ansible_default_ipv4.network == localnet %} mydomain = {{ ansible_hostname }}.home.casperlefantom.net {% else %} mydomain = {{ ansible_hostname }}.casperlefantom.net {% endif %} -{% endif %} # SENDING MAIL # @@ -151,7 +147,7 @@ myorigin = $mydomain #inet_interfaces = all #inet_interfaces = $myhostname #inet_interfaces = $myhostname, localhost -{% if is_mtamaster is defined %} +{% if mtadomain is defined %} inet_interfaces = all {% else %} inet_interfaces = localhost @@ -359,7 +355,7 @@ mynetworks = hash:/etc/postfix/network_table #relayhost = [mailserver.isp.tld] #relayhost = uucphost #relayhost = [an.ip.add.ress] -{% if is_mtamaster is defined %} +{% if mtadomain is defined %} ##relayhost = [smtp.free.fr] {% else %} relayhost = [mail.casperlefantom.net]:587 @@ -737,10 +733,10 @@ sample_directory = /usr/share/doc/postfix/samples # readme_directory = /usr/share/doc/postfix/README_FILES -{% if is_mtamaster is defined %} +{% if mtadomain is defined %} smtpd_tls_auth_only = yes -smtpd_tls_key_file = /etc/pki/tls/private/casperlefantom.1.key -smtpd_tls_cert_file = /etc/pki/tls/certs/casperlefantom.1.crt +smtpd_tls_key_file = /etc/pki/tls/private/casperlefantom.{{ crtversion }}.key +smtpd_tls_cert_file = /etc/pki/tls/certs/casperlefantom.{{ crtversion }}.crt smtpd_tls_security_level = may smtpd_tls_ciphers = high @@ -783,7 +779,7 @@ smtpd_relay_restrictions = smtpd_tls_loglevel = 2 -{% if is_mtamaster is defined %} +{% if mtadomain is defined %} smtpd_sasl_auth_enable = yes smtpd_sasl_type = dovecot smtpd_sasl_path = private/auth |