Browse Source

postfix: always include amavis and opendkim config when packmail

evolinux-users
Victor LABORIE 4 years ago
parent
commit
210b0095b6
  1. 2
      amavis/defaults/main.yml
  2. 2
      opendkim/defaults/main.yml
  3. 14
      postfix/templates/packmail_main.cf.j2
  4. 2
      postfix/templates/packmail_master.cf.j2

2
amavis/defaults/main.yml

@ -1,2 +0,0 @@
---
amavis_is_active: True

2
opendkim/defaults/main.yml

@ -1,2 +0,0 @@
---
opendkim_is_active: True

14
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 %}

2
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 %}
Loading…
Cancel
Save