From 210b0095b6139aaddb2775c3d9eb48dae064dd95 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Fri, 27 Oct 2017 14:23:35 +0200 Subject: [PATCH] postfix: always include amavis and opendkim config when packmail --- amavis/defaults/main.yml | 2 -- opendkim/defaults/main.yml | 2 -- postfix/templates/packmail_main.cf.j2 | 14 +++++--------- postfix/templates/packmail_master.cf.j2 | 2 -- 4 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 amavis/defaults/main.yml delete mode 100644 opendkim/defaults/main.yml diff --git a/amavis/defaults/main.yml b/amavis/defaults/main.yml deleted file mode 100644 index 5c727eff..00000000 --- a/amavis/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -amavis_is_active: True diff --git a/opendkim/defaults/main.yml b/opendkim/defaults/main.yml deleted file mode 100644 index 582c19d6..00000000 --- a/opendkim/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -opendkim_is_active: True diff --git a/postfix/templates/packmail_main.cf.j2 b/postfix/templates/packmail_main.cf.j2 index 5e80dbf5..9f14ec50 100644 --- a/postfix/templates/packmail_main.cf.j2 +++ b/postfix/templates/packmail_main.cf.j2 @@ -401,6 +401,11 @@ broken_sasl_auth_clients = yes smtpd_sasl_type = dovecot smtpd_sasl_path = private/auth-client +# Amavis and OpenDKIM +content_filter = smtp-amavis:[127.0.0.1]:10024 +smtpd_milters = inet:[127.0.0.1]:54321 +non_smtpd_milters = inet:[127.0.0.1]:54321 + {% if postfix_slow_transport_include == True %} # Slow transports configuration minimal_backoff_time = 2h @@ -416,12 +421,3 @@ slow_destination_concurrency_failed_cohort_limit = 100 slow_destination_recipient_limit = 25 transport_maps = hash:$config_directory/transport {% endif %} - -{% if amavis_is_active is defined and amavis_is_active == True %} -content_filter = smtp-amavis:[127.0.0.1]:10024 -{% endif %} - -{% if opendkim_is_active is defined and opendkim_is_active == True %} -smtpd_milters = inet:127.0.0.1:54321 -non_smtpd_milters = inet:127.0.0.1:54321 -{% endif %} diff --git a/postfix/templates/packmail_master.cf.j2 b/postfix/templates/packmail_master.cf.j2 index 6f693c8a..c3d0e40e 100644 --- a/postfix/templates/packmail_master.cf.j2 +++ b/postfix/templates/packmail_master.cf.j2 @@ -134,7 +134,6 @@ localhost:10026 inet n - y - 10 smtpd -o smtpd_recipient_restrictions=permit_mynetworks,reject -o mynetworks=127.0.0.0/8 -{% if amavis_is_active is defined and amavis_is_active == True %} smtp-amavis unix - - y - 2 lmtp -o lmtp_data_done_timeout=1200 -o lmtp_send_xforward_command=yes @@ -169,4 +168,3 @@ pre-cleanup unix n - n - 0 cleanup -o always_bcc= -o sender_bcc_maps= -o recipient_bcc_maps= -{% endif %}