X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fpostfix%2Fmaster.cf;h=374e246fb971925279920ddf14d186ceb1e1ef12;hb=41152bab7b400a39ca89d9f9919e90c7b49bdc5e;hp=f0046332be8211a0f36c67f89785ab4c8cfe01b1;hpb=b0da1a3b6963f3f6d7611770c8798f8dd7cac7d4;p=lhc%2Fateliers.git

diff --git a/etc/postfix/master.cf b/etc/postfix/master.cf
index f004633..374e246 100644
--- a/etc/postfix/master.cf
+++ b/etc/postfix/master.cf
@@ -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-cleanup
   -o content_filter=
   -o local_header_rewrite_clients=
   -o local_recipient_maps=
@@ -37,8 +38,9 @@ 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 content_filter=amavis:[127.0.0.1]:10024
+  -o cleanup_service_name=full-cleanup
+  #-o cleanup_service_name=pre-cleanup
+  #-o content_filter=amavis:[127.0.0.1]:10024
   -o milter_macro_daemon_name=ORIGINATING
   -o receive_override_options=no_address_mappings
   -o smtpd_sender_restrictions=permit_tls_clientcerts,reject
@@ -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=full-cleanup
+  #-o cleanup_service_name=pre-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,10 +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=full-cleanup
   #-o cleanup_service_name=pre-cleanup
-pre-cleanup unix n      -       -       -       0       cleanup
+  #-o content_filter=amavis:[127.0.0.1]:10024
+full-cleanup unix  n  -       -       -       0       cleanup
+pre-cleanup unix n    -       -       -       0       cleanup
   -o virtual_alias_maps=
-cleanup   unix  n       -       -       -       0       cleanup
+post-cleanup  unix  n -       -       -       0       cleanup
   -o mime_header_checks=
   -o nested_header_checks=
   -o body_checks=