--- conffiles/etc/amavis/conf.d/60-univention	(Revision 62085)
+++ conffiles/etc/amavis/conf.d/60-univention	(Arbeitskopie)
@@ -303,20 +303,19 @@ 
 # 5: more debug details
 #$log_level = 2;		# (defaults to 0)
 
+@!@
+if configRegistry.get('mail/amavis/debug/level'):
+	print "$log_level = '%s';" % configRegistry['mail/amavis/debug/level']
+@!@
+
 # Customizable template for the most interesting log file entry (e.g. with
 # $log_level=0) (take care to properly quote Perl special characters like '\')
 # For a list of available macros see README.customize .
 
-# only log infected messages (useful with log level 0):
-# $log_templ = '[? %#V |[? %#F ||banned filename ([%F|,])]|infected ([%V|,])]#
-# [? %#V |[? %#F ||, from=[?%o|(?)|<%o>], to=[<%R>|,][? %i ||, quarantine %i]]#
-# |, from=[?%o|(?)|<%o>], to=[<%R>|,][? %i ||, quarantine %i]]';
+# We rely on the built-in log template for now.
+# If needed, a custom log template can be specified via
+# $log_templ = 
 
-# log both infected and noninfected messages (default):
-$log_templ = '[? %#V |[? %#F |[?%#D|Not-Delivered|Passed]|BANNED name/type (%F)]|INFECTED (%V)], #
-[?%o|(?)|<%o>] -> [<%R>|,][? %i ||, quarantine %i], Message-ID: %m, Hits: %c';
-
-
 #
 # Section IV - Notifications/DSN, BOUNCE/REJECT/DROP/PASS destiny, quarantine
 #
--- debian/univention-antivir-mail.univention-config-registry	(Revision 62085)
+++ debian/univention-antivir-mail.univention-config-registry	(Arbeitskopie)
@@ -15,6 +15,7 @@ 
 Variables: mail/antivir/banned/mime_type
 Variables: mail/antivir/banned/rfc2046
 Variables: mail/antispam/headertag
+Variables: mail/amavis/debug/level
 
 Type: file
 File: etc/amavis/conf.d/15-content_filter_mode
--- debian/univention-antivir-mail.univention-config-registry-variables	(Revision 62085)
+++ debian/univention-antivir-mail.univention-config-registry-variables	(Arbeitskopie)
@@ -57,3 +57,9 @@ 
 Description[en]=String to prepend to subject header field for SPAM messages. If the variable is unset, the subject is not modified.
 Type=str
 Categories=service-mail
+
+[mail/amavis/debug/level]
+Description[de]=Log Level für amavisd-new. Mögliche Werte sind 0 bis 5. Ist die Variable nicht gesetzt, wird der Defaultwert von 0 verwendet.
+Description[en]=Log level for amavisd-new. Possible values are 0 to 5. If the variable is unset, the default value of 0 is used.
+Type=int
+Categories=service-mail