steffen: server/kolabd/kolabd/templates amavisd.conf.template, 1.4, 1.5

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv6358/kolabd/templates

Modified Files:
	amavisd.conf.template 
Log Message:
Fix for issue682 (amavis internal/external bounce/notification)

Index: amavisd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- amavisd.conf.template	5 Apr 2005 20:30:13 -0000	1.4
+++ amavisd.conf.template	9 Apr 2005 01:11:03 -0000	1.5
@@ -281,7 +281,7 @@
 # 3: server, client
 # 4: decompose parts
 # 5: more debug details
-$log_level = 2;		  # (defaults to 0)
+#$log_level = 5;		  # (defaults to 0)
 
 # Customizable template for the most interesting log file entry (e.g. with
 # $log_level=0) (take care to properly quote Perl special characters like '\')
@@ -440,17 +440,21 @@
 # not standardized, so virus names may need to be adjusted.
 # See README.lookups for syntax, check also README.policy-on-notifications
 #
-$viruses_that_fake_sender_re = new_RE(
-  qr'nimda|hybris|klez|bugbear|yaha|braid|sobig|fizzer|palyh|peido|holar'i,
-  qr'tanatos|lentin|bridex|mimail|trojan\.dropper|dumaru|parite|spaces'i,
-  qr'dloader|galil|gibe|swen|netwatch|bics|sbrowse|sober|rox|val(hal)?la'i,
-  qr'frethem|sircam|be?agle|tanx|mydoom|novarg|shimg|netsky|somefool|moodown'i,
-  qr'@mm|@MM',    # mass mailing viruses as labeled by f-prot and @l_prefix@/bin/uvscan
-  qr'Worm'i,      # worms as labeled by ClamAV, Kaspersky, etc
-  [qr'^(EICAR|Joke\.|Junk\.)'i         => 0],
-  [qr'^(WM97|OF97|W95/CIH-|JS/Fort)'i  => 0],
-  [qr/.*/ => 1],  # true by default  (remove or comment-out if undesired)
-);
+# $viruses_that_fake_sender_re = new_RE(
+#   qr'nimda|hybris|klez|bugbear|yaha|braid|sobig|fizzer|palyh|peido|holar'i,
+#   qr'tanatos|lentin|bridex|mimail|trojan\.dropper|dumaru|parite|spaces'i,
+#   qr'dloader|galil|gibe|swen|netwatch|bics|sbrowse|sober|rox|val(hal)?la'i,
+#   qr'frethem|sircam|be?agle|tanx|mydoom|novarg|shimg|netsky|somefool|moodown'i,
+#   qr'@mm|@MM',    # mass mailing viruses as labeled by f-prot and @l_prefix@/bin/uvscan
+#   qr'Worm'i,      # worms as labeled by ClamAV, Kaspersky, etc
+#   [qr'^(EICAR|Joke\.|Junk\.)'i         => 0],
+#   [qr'^(WM97|OF97|W95/CIH-|JS/Fort)'i  => 0],
+#   [qr/.*/ => 1],  # true by default  (remove or comment-out if undesired)
+# );
+# Since we only bounce to internal users with trusted addresses,
+# we'll leave this empty
+$viruses_that_fake_sender_re = new_RE();
+ at viruses_that_fake_sender_maps = ();
 
 
 # where to send ADMIN VIRUS NOTIFICATIONS (should be a fully qualified address)
@@ -1495,11 +1499,17 @@
 # local sender addresses can be trusted -- for example by requireing
 # authentication before letting the users send with their local address.
 
+ at mynetworks = qw( @@@postfix-mynetworks@@@ );
+
 $policy_bank{'MYUSERS'} = {  # mail from authenticated users on this system
   # Bounce only to local users
   final_virus_destiny      => D_BOUNCE,
   final_banned_destiny     => D_BOUNCE,
-  viruses_that_fake_sender_re => 0,
+  warnvirusrecip_maps => undef,	# (defaults to false (undef))
+  warnbannedrecip_maps => undef,# (defaults to false (undef))
+  warnvirussender => 1,
+  warnbannedsender => 1,
+  mynetworks => qw(0.0.0.0/0),
 };