diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2017-04-21 20:52:24 +0100 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2017-04-21 20:52:24 +0100 |
| commit | 18d7f414798a013a430e098e7361e5f53d57b684 (patch) | |
| tree | 946f7618ea8e96b0406ae8b4aff2bd742ab4e893 | |
| parent | 93848667bad2b528572cec8844d155753077d5fa (diff) | |
| download | puppet-18d7f414798a013a430e098e7361e5f53d57b684.tar puppet-18d7f414798a013a430e098e7361e5f53d57b684.tar.gz puppet-18d7f414798a013a430e098e7361e5f53d57b684.tar.bz2 puppet-18d7f414798a013a430e098e7361e5f53d57b684.tar.xz puppet-18d7f414798a013a430e098e7361e5f53d57b684.zip | |
Explicitely use alamut for relay host, our other MX doesn't accept to relay
| -rw-r--r-- | modules/postfix/templates/main.cf | 2 | ||||
| -rw-r--r-- | modules/postfix/templates/simple_relay_main.cf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf index 0a38e971..acdc7bb4 100644 --- a/modules/postfix/templates/main.cf +++ b/modules/postfix/templates/main.cf @@ -18,7 +18,7 @@ mailq_path = /usr/bin/mailq queue_directory = /var/spool/postfix mail_owner = postfix <% if all_tags.include?('postfix::simple_relay') %> -relayhost = <%= domain %> +relayhost = alamut.<%= domain %> <%- end -%> # User configurable parameters diff --git a/modules/postfix/templates/simple_relay_main.cf b/modules/postfix/templates/simple_relay_main.cf index e05c49ba..1f2a2f57 100644 --- a/modules/postfix/templates/simple_relay_main.cf +++ b/modules/postfix/templates/simple_relay_main.cf @@ -34,7 +34,7 @@ smtpd_use_tls = yes smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt -relayhost = <%= domain %> +relayhost = alamut.<%= domain %> <%- if classes.include?('sympa::server') -%> mydestination = ml.<%= domain %> |