X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fpostfix%2Fmaster.cf;h=2e81be8260166d8ddca9707ab6970bd0e0a2ab19;hp=8c5c565db26e48dce7672af546e81333c5657fa7;hb=1908ea4d1b60d514c11afbbc1a7f5c8e14a4f030;hpb=b27661cf8e40872543f86a00922d18573ef83612

diff --git a/etc/postfix/master.cf b/etc/postfix/master.cf
index 8c5c565..2e81be8 100644
--- a/etc/postfix/master.cf
+++ b/etc/postfix/master.cf
@@ -6,29 +6,70 @@
 #               (yes)   (yes)   (yes)   (never) (100)
 # ==========================================================================
 smtp      inet  n       -       -       -       -       smtpd
+  -o cleanup_service_name=pre-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
+amavis    unix  -       -       n        -      2       lmtp
+  -o lmtp_data_done_timeout=1200
+  -o lmtp_send_xforward_command=yes
+  -o lmtp_tls_note_starttls_offer=no
+127.0.0.1:10025 inet n  -       n       -       -       smtpd
+  -o content_filter=
+  -o local_header_rewrite_clients=
+  -o local_recipient_maps=
+  -o mynetworks=127.0.0.0/8
+  -o receive_override_options=no_header_body_checks,no_milters,no_unknown_recipient_checks
+  -o relay_recipient_maps=
+  -o smtpd_client_connection_count_limit=0
+  -o smtpd_client_connection_rate_limit=0
+  -o smtpd_client_restrictions=permit_mynetworks,reject
+  -o smtpd_data_restrictions=reject_unauth_pipelining
+  -o smtpd_delay_reject=no
+  -o smtpd_end_of_data_restrictions=
+  -o smtpd_error_sleep_time=0
+  -o smtpd_hard_error_limit=1000
+  -o smtpd_helo_restrictions=
+  -o smtpd_milters=
+  -o smtpd_recipient_restrictions=permit_mynetworks,reject
+  -o smtpd_restriction_classes=
+  -o smtpd_sender_restrictions=
+  -o smtpd_soft_error_limit=1001
+  -o strict_rfc821_envelopes=yes
 submission inet n       -       -       -       -       smtpd
-  -o smtpd_tls_security_level=encrypt
+  -o cleanup_service_name=pre-cleanup
+  -o content_filter=amavis:[127.0.0.1]:10024
   -o milter_macro_daemon_name=ORIGINATING
-#  -o smtpd_tls_req_ccert=yes
+  -o receive_override_options=no_address_mappings
+  -o smtpd_sender_restrictions=permit_tls_clientcerts,reject
   -o smtpd_tls_ask_ccert=yes
-  -o smtpd_tls_loglevel=1
-  -o smtpd_tls_ccert_verifydepth=2
   -o smtpd_tls_auth_only=yes
-  -o smtpd_sasl_auth_enable=yes
-smtps     inet  n       -       -       -       -       smtpd
+  -o smtpd_tls_ccert_verifydepth=2
+  -o smtpd_tls_loglevel=1
+  -o smtpd_tls_req_ccert=yes
   -o smtpd_tls_security_level=encrypt
-  -o smtpd_tls_wrappermode=yes
-  -o smtpd_sasl_auth_enable=yes
-  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+smtps     inet  n       -       -       -       -       smtpd
   -o milter_macro_daemon_name=ORIGINATING
-  -o smtpd_tls_req_ccert=no
+  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+  -o smtpd_sasl_auth_enable=yes
   -o smtpd_tls_ask_ccert=yes
-  -o smtpd_tls_loglevel=1
-  -o smtpd_tls_ccert_verifydepth=2
   -o smtpd_tls_auth_only=yes
+  -o smtpd_tls_ccert_verifydepth=0
+  -o smtpd_tls_loglevel=1
+  -o smtpd_tls_req_ccert=no
+  -o smtpd_tls_security_level=encrypt
+  -o smtpd_tls_wrappermode=yes
 #628      inet  n       -       -       -       -       qmqpd
 pickup    fifo  n       -       -       60      1       pickup
+  -o cleanup_service_name=pre-cleanup
+  -o content_filter=amavis:[127.0.0.1]:10024
+pre-cleanup unix n      -       -       -       0       cleanup
+  -o virtual_alias_maps=
 cleanup   unix  n       -       -       -       0       cleanup
+  -o mime_header_checks=
+  -o nested_header_checks=
+  -o body_checks=
+  -o header_checks=
 qmgr      fifo  n       -       n       300     1       qmgr
 #qmgr     fifo  n       -       -       300     1       oqmgr
 tlsmgr    unix  -       -       -       1000?   1       tlsmgr
@@ -90,7 +131,9 @@ spfcheck  unix  -       n       n       -       0       spawn
   user=policyd-spf argv=/usr/sbin/postfix-policyd-spf-perl
 noclue    unix  -       n       n       -       -       pipe
   flags=q user=noclue argv=/usr/local/bin/noclue-delivery ${recipient} ${sender}
-sympa unix - n n - - pipe
-  flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient}
-sympabounce unix - n n - - pipe
-  flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${recipient}
+#-- SYMPA begin
+#sympa unix - n n - - pipe
+#  flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient}
+#sympabounce unix - n n - - pipe
+#  flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${recipient}
+#-- SYMPA end