wilde: server/kolabd/kolabd/templates clamd.conf.template.in, 1.3.4.1, 1.3.4.1.2.1 main.cf.template.in, 1.22, 1.22.4.1 master.cf.template.in, 1.25, 1.25.4.1

[cvs at kolab.org]

Author: wilde

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

Modified Files:
      Tag: suc_branch
	clamd.conf.template.in main.cf.template.in 
	master.cf.template.in 
Log Message:
Merged changes from 2.2.2 release.

Index: clamd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/clamd.conf.template.in,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.1.2.1
diff -u -d -r1.3.4.1 -r1.3.4.1.2.1
--- clamd.conf.template.in	6 Apr 2009 16:17:55 -0000	1.3.4.1
+++ clamd.conf.template.in	18 Jun 2009 15:45:39 -0000	1.3.4.1.2.1
@@ -121,6 +121,26 @@
 # Default: 120
 #ReadTimeout 300
 
+# This option specifies the time (in seconds) after which clamd should
+# timeout if a client doesn't provide any initial command after connecting.
+# Default: 5
+#CommandReadTimeout 5
+
+# This option specifies how long to wait (in miliseconds) if the send buffer is full.
+# Keep this value low to prevent clamd hanging
+#
+# Default: 500
+#SendBufTimeout 200
+
+# Maximum number of queued items (including those being processed by MaxThreads threads)
+# It is recommended to have this value at least twice MaxThreads if possible.
+# WARNING: you shouldn't increase this too much to avoid running out  of file descriptors,
+# the following condition should hold:
+# MaxThreads*MaxRecursion + (MaxQueue - MaxThreads) + 6< RLIMIT_NOFILE (usual max is 1024)
+#
+# Default: 100
+#MaxQueue 200
+
 # Waiting for a new job will timeout after this time (seconds).
 # Default: 30
 #IdleTimeout 60
@@ -144,7 +164,7 @@
 #FollowFileSymlinks yes
 
 # Perform a database check.
-# Default: 1800 (30 min)
+# Default: 600 (10 min)
 #SelfCheck 600
 
 # Execute a command when virus is found. In the command string %v will
@@ -341,11 +361,6 @@
 # ClamAV can scan within archives and compressed files.
 # Default: yes
 #ScanArchive yes
-
-# Use slower but memory efficient decompression algorithm.
-# only affects the bzip2 decompressor.
-# Default: no
-#ArchiveLimitMemoryUsage yes
 
 # Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
 # Default: no

Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.22
retrieving revision 1.22.4.1
diff -u -d -r1.22 -r1.22.4.1
--- main.cf.template.in	30 Jan 2009 12:00:49 -0000	1.22
+++ main.cf.template.in	18 Jun 2009 15:45:39 -0000	1.22.4.1
@@ -55,6 +55,10 @@
 masquerade_classes = envelope_sender, envelope_recipient,
                      header_sender, header_recipient
 
+# See kolab/issue3549 (append_dot_mydomain allows circumventing kolabfilter-verify-from-header)
+append_dot_mydomain = no
+remote_header_rewrite_domain = domain.invalid
+
 #   smtp daemon
 #smtpd_banner = $myhostname ESMTP $mail_name
 @@@if bind_any@@@

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.25
retrieving revision 1.25.4.1
diff -u -d -r1.25 -r1.25.4.1
--- master.cf.template.in	8 Nov 2008 11:59:28 -0000	1.25
+++ master.cf.template.in	18 Jun 2009 15:45:39 -0000	1.25.4.1
@@ -48,7 +48,7 @@
 #ifmail   unix  -       n       n       -       -       pipe flags=F user=ftn argv=@bindir@/ifmail -r $nexthop ($recipient)
 #bsmtp    unix  -       n       n       -       -       pipe flags=Fq. user=foo argv=@bindir@/bsmtp -f $sender $nexthop $recipient
 @@@bind_addr@@@:465       inet  n       -       n       -       -       smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
-post-cleanup unix  n    -       n       -       0       cleanup -o virtual_alias_maps=
+post-cleanup unix  n    -       n       -       0       cleanup -o virtual_alias_maps= -o masquerade_domains=
 smtp-amavis unix -	-	n	-	2       smtp
     -o smtp_data_done_timeout=1200
     -o smtp_send_xforward_command=yes