48 lines
2.4 KiB
Text
48 lines
2.4 KiB
Text
Index: amavisd.conf
|
|
--- amavisd.conf.orig
|
|
+++ amavisd.conf
|
|
@@ -17,12 +17,12 @@ use strict;
|
|
# truncation in /proc/<pid>/stat and ps -e output
|
|
|
|
$max_servers = 2; # num of pre-forked children (2..30 is common), -m
|
|
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
|
|
-$daemon_group = 'vscan'; # (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 = 'example.com'; # a convenient default for other settings
|
|
|
|
-# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H
|
|
+$MYHOME = '/var/amavisd'; # 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 = '/var/virusmails'; # -Q
|
|
@@ -235,7 +235,7 @@ $banned_filename_re = new_RE(
|
|
|
|
qr'.\.(exe|vbs|pif|scr|cpl)$'i, # banned extension - basic
|
|
# qr'.\.(exe|vbs|pif|scr|cpl|bat|cmd|com)$'i, # banned extension - basic+cmd
|
|
-# qr'.\.(ade|adp|app|bas|bat|chm|cmd|com|cpl|crt|emf|exe|fxp|grp|hlp|hta|
|
|
+# qr'.\.(ade|adp|app|bas|bat|chm|cmd|com|cpl|crt|emf|exe|fxp|gadget|grp|hlp|hta|
|
|
# inf|ini|ins|isp|js|jse|lib|lnk|mda|mdb|mde|mdt|mdw|mdz|msc|msi|
|
|
# msp|mst|ocx|ops|pcd|pif|prg|reg|scr|sct|shb|shs|sys|vb|vbe|vbs|vxd|
|
|
# wmf|wsc|wsf|wsh)$'ix, # banned extensions - long
|
|
@@ -319,7 +319,7 @@ $banned_filename_re = new_RE(
|
|
@decoders = (
|
|
['mail', \&do_mime_decode],
|
|
# [[qw(asc uue hqx ync)], \&do_ascii], # not safe
|
|
- ['F', \&do_uncompress, ['unfreeze', 'freeze -d', 'melt', 'fcat'] ],
|
|
+# ['F', \&do_uncompress, ['unfreeze', 'freeze -d', 'melt', 'fcat'] ],
|
|
['Z', \&do_uncompress, ['uncompress', 'gzip -d', 'zcat'] ],
|
|
['gz', \&do_uncompress, 'gzip -d'],
|
|
['gz', \&do_gunzip],
|
|
@@ -338,8 +338,8 @@ $banned_filename_re = new_RE(
|
|
# ['/usr/local/heirloom/usr/5bin/pax', 'pax', 'gcpio', 'cpio']
|
|
['deb', \&do_ar, 'ar'],
|
|
# ['a', \&do_ar, 'ar'], # unpacking .a seems an overkill
|
|
- ['rar', \&do_unrar, ['unrar', 'rar'] ],
|
|
- ['arj', \&do_unarj, ['unarj', 'arj'] ],
|
|
+ ['rar', \&do_7zip, ['7z'] ],
|
|
+ ['arj', \&do_7zip, ['7z'] ],
|
|
['arc', \&do_arc, ['nomarch', 'arc'] ],
|
|
['zoo', \&do_zoo, ['zoo', 'unzoo'] ],
|
|
['doc', \&do_ole, 'ripole'],
|