dépôts
/
lhc
/
ateliers.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correction : etc/postfix/master.cf : no-amavis-cleanup pour verify(8).
[lhc/ateliers.git]
/
etc
/
postfix
/
master.cf
diff --git
a/etc/postfix/master.cf
b/etc/postfix/master.cf
index
f004633
..
b0ccd97
100644
(file)
--- a/
etc/postfix/master.cf
+++ b/
etc/postfix/master.cf
@@
-6,7
+6,7
@@
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
smtp inet n - - - - smtpd
# (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
-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 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=
-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 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=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
-o smtpd_sender_restrictions=permit_tls_clientcerts,reject
-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 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
-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 smtpd_tls_wrappermode=yes
#628 inet n - - - - qmqpd
pickup fifo n - - 60 1 pickup
- #-o cleanup_service_name=pre-cleanup
-pre-cleanup unix n - - - 0 cleanup
+ -o cleanup_service_name=no-amavis-cleanup
+ #-o cleanup_service_name=pre-amavis-cleanup
+ #-o content_filter=amavis:[127.0.0.1]:10024
+no-amavis-cleanup unix n - - - 0 cleanup
+pre-amavis-cleanup unix n - - - 0 cleanup
-o virtual_alias_maps=
-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=
-o mime_header_checks=
-o nested_header_checks=
-o body_checks=
@@
-74,9
+82,13
@@
qmgr fifo n - n 300 1 qmgr
tlsmgr unix - - - 1000? 1 tlsmgr
rewrite unix - - - - - trivial-rewrite
bounce unix - - - - 0 bounce
tlsmgr unix - - - 1000? 1 tlsmgr
rewrite unix - - - - - trivial-rewrite
bounce unix - - - - 0 bounce
+ -o cleanup_service_name=no-amavis-cleanup
defer unix - - - - 0 bounce
defer unix - - - - 0 bounce
+ -o cleanup_service_name=no-amavis-cleanup
trace unix - - - - 0 bounce
trace unix - - - - 0 bounce
+ -o cleanup_service_name=no-amavis-cleanup
verify unix - - - - 1 verify
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
flush unix n - - 1000? 0 flush
proxymap unix - - n - - proxymap
proxywrite unix - - n - 1 proxymap
@@
-90,6
+102,7
@@
error unix - - - - - error
retry unix - - - - - error
discard unix - - - - - discard
local unix - n n - - local
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
virtual unix - n n - - virtual
lmtp unix - - - - - lmtp
anvil unix - - - - 1 anvil