From 0122d6d06efb9a5e5f9bc4f10955812e1a8f8566 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Thu, 14 Mar 2024 14:39:50 +0100 Subject: [PATCH] daily autocommit --- amavis/conf.d/20-debian_defaults | 2 +- amavis/conf.d/21-ubuntu_defaults | 6 +++--- postfix/master.cf | 24 +++++++++++++----------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/amavis/conf.d/20-debian_defaults b/amavis/conf.d/20-debian_defaults index f162d1d1c..6c9e761b3 100644 --- a/amavis/conf.d/20-debian_defaults +++ b/amavis/conf.d/20-debian_defaults @@ -33,7 +33,7 @@ $enable_global_cache = 1; # enable use of libdb-based cache if $enable_db=1 $inet_socket_port = 10024; # default listening socket $sa_spam_subject_tag = '***SPAM*** '; -$sa_tag_level_deflt = undef; # add spam info headers if at, or above that level +$sa_tag_level_deflt = -9999; # add spam info headers if at, or above that level $sa_tag2_level_deflt = 5; # add 'spam detected' headers at that level $sa_kill_level_deflt = 20; # triggers spam evasive actions $sa_dsn_cutoff_level = 10; # spam level beyond which a DSN is not sent diff --git a/amavis/conf.d/21-ubuntu_defaults b/amavis/conf.d/21-ubuntu_defaults index e8dc67fe3..3de432223 100644 --- a/amavis/conf.d/21-ubuntu_defaults +++ b/amavis/conf.d/21-ubuntu_defaults @@ -9,11 +9,11 @@ $enable_dkim_verification = 1; @whitelist_sender_acl = qw( .$mydomain ); $final_virus_destiny = D_DISCARD; # (defaults to D_BOUNCE) $final_banned_destiny = D_DISCARD; # (defaults to D_BOUNCE) -$final_spam_destiny = D_DISCARD; # (defaults to D_REJECT) +$final_spam_destiny = D_PASS; # (defaults to D_REJECT) $final_bad_header_destiny = D_PASS; # (defaults to D_PASS), D_BOUNCE suggested -$virus_admin = undef; -$spam_admin = undef; +$virus_admin = "postmaster\@$mydomain"; +$spam_admin = "postmaster\@$mydomain"; #------------ Do not modify anything below this line ------------- 1; # insure a defined return diff --git a/postfix/master.cf b/postfix/master.cf index 98356f033..7ea682887 100644 --- a/postfix/master.cf +++ b/postfix/master.cf @@ -8,8 +8,16 @@ ### smtp inet n - n - 1 postscreen -o smtpd_sasl_auth_enable=no -#smtp inet n - n - - smtpd -# -o smtpd_milters=smtp:[127.0.0.1]:10024 + +smtp-amavis unix - - - - 2 smtp + -o smtp_data_done_timeout=1200 + -o smtp_send_xforward_command=yes + -o disable_dns_lookups=yes + -o max_use=20 + -o smtp_tls_security_level=none + +smtp inet n - n - - smtpd + -o smtpd_milters=smtp:[127.0.0.1]:10024 ### ### SMTP-Daemon hinter Postscreen: Schleift E-Mails zur Filterung durch Amavis ### @@ -45,10 +53,10 @@ submission inet n - n - - smtpd ### Weitere wichtige Dienste für den Serverbetrieb ### pickup unix n - n 60 1 pickup - -o content_filter=smtp-amavis:[127.0.0.1]:10024 + -o content_filter= -o receive_override_options=no_header_body_checks -#bei pickup rausgenommen -# -o content_filter= + +# -o content_filter=smtp-amavis:[127.0.0.1]:10024 cleanup unix n - n - 0 cleanup qmgr unix n - n 300 1 qmgr @@ -77,12 +85,6 @@ submission-header-cleanup unix n - n - 0 cleanup policy-spf unix - n n - - spawn user=nobody argv=/usr/bin/policyd-spf -smtp-amavis unix - - - - 2 smtp - -o smtp_data_done_timeout=1200 - -o smtp_send_xforward_command=yes - -o disable_dns_lookups=yes - -o max_use=20 - -o smtp_tls_security_level=none 127.0.0.1:10025 inet n - - - - smtpd -o content_filter= -- 2.43.0