diff options
| author | Maat <maat@mageia.org> | 2024-10-13 23:16:40 +0200 |
|---|---|---|
| committer | Maat <maat@mageia.org> | 2024-10-13 23:16:40 +0200 |
| commit | 6e05c39e093b9d278d8c7fe7e06faee09062c36e (patch) | |
| tree | a91c95fc34126f2928ae0522962f8536a66f01fa /modules/postfix | |
| parent | ecafbbf7dc10ccdd7f6457a82ed37c5183f10654 (diff) | |
| download | puppet-6e05c39e093b9d278d8c7fe7e06faee09062c36e.tar puppet-6e05c39e093b9d278d8c7fe7e06faee09062c36e.tar.gz puppet-6e05c39e093b9d278d8c7fe7e06faee09062c36e.tar.bz2 puppet-6e05c39e093b9d278d8c7fe7e06faee09062c36e.tar.xz puppet-6e05c39e093b9d278d8c7fe7e06faee09062c36e.zip | |
Fixing mistakein line placement
Diffstat (limited to 'modules/postfix')
| -rw-r--r-- | modules/postfix/templates/main.cf | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf index 798ad6da..1d0658fc 100644 --- a/modules/postfix/templates/main.cf +++ b/modules/postfix/templates/main.cf @@ -79,6 +79,16 @@ virtual_alias_maps = ldap:/etc/postfix/ldap_aliases.conf hash:/etc/postfix/virtual_aliases + +<%- if classes.include?('sympa::server') -%> + regexp:/etc/postfix/sympa_aliases +<%- end -%> +<% else %> +<%- if classes.include?('sympa::server') -%> +virtual_alias_maps = regexp:/etc/postfix/sympa_aliases +<%- end -%> +<%- end -%> + # Adding DKIM Miler for primaryserver (sucuk) smtpd_milters = inet:127.0.0.1:8891 non_smtpd_milters = $smtpd_milters @@ -91,16 +101,6 @@ sender_canonical_classes = envelope_sender #recipient_canonical_maps = tcp:localhost:10002 #recipient_canonical_classes= envelope_recipient,header_recipient -<%- if classes.include?('sympa::server') -%> - regexp:/etc/postfix/sympa_aliases -<%- end -%> -<% else %> -<%- if classes.include?('sympa::server') -%> -virtual_alias_maps = regexp:/etc/postfix/sympa_aliases -<%- end -%> -<%- end -%> - - <%- if all_tags.include?('postfix::server') -%> transport_maps = regexp:/etc/postfix/transport_regexp content_filter = smtp-filter:[127.0.0.1]:10025 |