daily autocommit

diff --git a/amavis/conf.d/20-debian_defaults b/amavis/conf.d/20-debian_defaults
index f162d1d1c0e76c8d2068bb1c244bb1c360e7f101..6c9e761b3dd19b050316c58d14c04cb8f2dc077f 100644 (file)
--- 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 e8dc67fe328a8f93748dfb86ec29e0ba4c50d572..3de43222367c67f9eeceb738876bd51db449f10f 100644 (file)
--- 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 98356f03312ba3f725062a6aab4e9ea67818caa0..7ea68288730a51e690e98c5f1eea59e00ce0c636 100644 (file)
--- 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=