X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fpostfix%2Fmaster.cf;h=b0ccd9774da52a9cbd7f44c770bf96d8c1aee82a;hb=4cf8289c183152882bc3eb98c92633bd4a11c4ea;hp=d13999473ff27cca7ecee432d7ea23bb90d27556;hpb=380109f7312c8a1c38b24f32cdc141764bae14f4;p=lhc%2Fateliers.git

diff --git a/etc/postfix/master.cf b/etc/postfix/master.cf
index d139994..b0ccd97 100644
--- a/etc/postfix/master.cf
+++ b/etc/postfix/master.cf
@@ -6,7 +6,7 @@
 #               (yes)   (yes)   (yes)   (never) (100)
 # ==========================================================================
 smtp      inet  n       -       -       -       -       smtpd
-  -o cleanup_service_name=pre-cleanup
+  -o cleanup_service_name=pre-amavis-cleanup
   -o content_filter=amavis:[127.0.0.1]:10024
   -o smtpd_sender_restrictions=reject_unauth_pipelining,reject_non_fqdn_sender,permit
   -o receive_override_options=no_address_mappings
@@ -15,6 +15,7 @@ amavis    unix  -       -       n        -      2       lmtp
   -o lmtp_send_xforward_command=yes
   -o lmtp_tls_note_starttls_offer=no
 127.0.0.1:10025 inet n  -       n       -       -       smtpd
+  -o cleanup_service_name=post-amavis-cleanup
   -o content_filter=
   -o local_header_rewrite_clients=
   -o local_recipient_maps=
@@ -37,7 +38,8 @@ amavis    unix  -       -       n        -      2       lmtp
   -o smtpd_soft_error_limit=1001
   -o strict_rfc821_envelopes=yes
 submission inet n       -       -       -       -       smtpd
-  -o cleanup_service_name=pre-cleanup
+  -o cleanup_service_name=no-amavis-cleanup
+  #-o cleanup_service_name=pre-amavis-cleanup
   #-o content_filter=amavis:[127.0.0.1]:10024
   -o milter_macro_daemon_name=ORIGINATING
   -o receive_override_options=no_address_mappings
@@ -49,6 +51,9 @@ submission inet n       -       -       -       -       smtpd
   -o smtpd_tls_req_ccert=yes
   -o smtpd_tls_security_level=encrypt
 smtps     inet  n       -       -       -       -       smtpd
+  -o cleanup_service_name=no-amavis-cleanup
+  #-o cleanup_service_name=pre-amavis-cleanup
+  #-o content_filter=amavis:[127.0.0.1]:10024
   -o milter_macro_daemon_name=ORIGINATING
   -o smtpd_client_restrictions=permit_sasl_authenticated,reject
   -o smtpd_sasl_auth_enable=yes
@@ -61,11 +66,13 @@ smtps     inet  n       -       -       -       -       smtpd
   -o smtpd_tls_wrappermode=yes
 #628      inet  n       -       -       -       -       qmqpd
 pickup    fifo  n       -       -       60      1       pickup
-  -o cleanup_service_name=pre-cleanup
+  -o cleanup_service_name=no-amavis-cleanup
+  #-o cleanup_service_name=pre-amavis-cleanup
   #-o content_filter=amavis:[127.0.0.1]:10024
-pre-cleanup unix n      -       -       -       0       cleanup
+no-amavis-cleanup unix  n -   -       -       0       cleanup
+pre-amavis-cleanup unix n -   -       -       0       cleanup
   -o virtual_alias_maps=
-cleanup   unix  n       -       -       -       0       cleanup
+post-amavis-cleanup unix n -  -       -       0       cleanup
   -o mime_header_checks=
   -o nested_header_checks=
   -o body_checks=
@@ -75,9 +82,13 @@ qmgr      fifo  n       -       n       300     1       qmgr
 tlsmgr    unix  -       -       -       1000?   1       tlsmgr
 rewrite   unix  -       -       -       -       -       trivial-rewrite
 bounce    unix  -       -       -       -       0       bounce
+  -o cleanup_service_name=no-amavis-cleanup
 defer     unix  -       -       -       -       0       bounce
+  -o cleanup_service_name=no-amavis-cleanup
 trace     unix  -       -       -       -       0       bounce
+  -o cleanup_service_name=no-amavis-cleanup
 verify    unix  -       -       -       -       1       verify
+  -o cleanup_service_name=no-amavis-cleanup
 flush     unix  n       -       -       1000?   0       flush
 proxymap  unix  -       -       n       -       -       proxymap
 proxywrite unix -       -       n       -       1       proxymap
@@ -91,6 +102,7 @@ error     unix  -       -       -       -       -       error
 retry     unix  -       -       -       -       -       error
 discard   unix  -       -       -       -       -       discard
 local     unix  -       n       n       -       -       local
+  -o cleanup_service_name=no-amavis-cleanup
 virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       -       -       -       lmtp
 anvil     unix  -       -       -       -       1       anvil