File pykolab-0.7.11-SUSE_template_amavisd.patch of Package pykolab
diff -Ppru pykolab-0.7.11.orig/share/templates/amavisd.conf.tpl pykolab-0.7.11_SUSE_template_amavisd/share/templates/amavisd.conf.tpl
--- pykolab-0.7.11.orig/share/templates/amavisd.conf.tpl 2015-03-27 15:24:53.000000000 +0100
+++ pykolab-0.7.11_SUSE_template_amavisd/share/templates/amavisd.conf.tpl 2015-04-01 10:37:59.947966161 +0200
@@ -15,12 +15,12 @@ use strict;
# \$bypass_decode_parts = 1; # controls running of decoders&dearchivers
\$max_servers = 2; # num of pre-forked children (2..30 is common), -m
-\$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u
-\$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g
+\$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
+\$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
\$mydomain = '$primary_domain'; # a convenient default for other settings
-\$MYHOME = '/var/spool/amavisd'; # a convenient default for other settings, -H
+\$MYHOME = '/var/spool/amavis'; # a convenient default for other settings, -H
\$TEMPBASE = "\$MYHOME/tmp"; # working directory, needs to exist, -T
\$ENV{TMPDIR} = \$TEMPBASE; # environment variable TMPDIR, used by SA, etc.
\$QUARANTINEDIR = undef; # -Q
@@ -32,8 +32,8 @@ use strict;
\$db_home = "\$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D
# \$helpers_home = "\$MYHOME/var"; # working directory for SpamAssassin, -S
-\$lock_file = "/var/run/amavisd/amavisd.lock"; # -L
-\$pid_file = "/var/run/amavisd/amavisd.pid"; # -P
+\$lock_file = "\$MYHOME/amavisd.lock"; # -L
+\$pid_file = "\$MYHOME/amavisd.pid"; # -P
#NOTE: create directories \$MYHOME/tmp, \$MYHOME/var, \$MYHOME/db manually
\$log_level = 9; # verbosity 0..5, -d
@@ -373,7 +373,7 @@ use strict;
# \#\## http://www.clamav.net/
['ClamAV-clamd',
- \&ask_daemon, ["CONTSCAN {}\n", "$clamdsock"],
+ \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd-socket"],
qr/\bOK\$/m, qr/\bFOUND\$/m,
qr/^.*?: (?!Infected Archive)(.*) FOUND\$/m ],
# # NOTE: run clamd under the same user as amavisd, or run it under its own