| 1 |
diff -Naur amavisd-new-2.6.4/amavisd amavisd-new-2.6.4.oden/amavisd |
| 2 |
--- amavisd-new-2.6.4/amavisd 2009-06-25 14:39:01.000000000 +0200 |
| 3 |
+++ amavisd-new-2.6.4.oden/amavisd 2009-06-27 12:56:16.000000000 +0200 |
| 4 |
@@ -633,7 +633,7 @@ |
| 5 |
# |
| 6 |
BEGIN { |
| 7 |
# serves only as a quick default for other configuration settings |
| 8 |
- $MYHOME = '/var/amavis'; |
| 9 |
+ $MYHOME = '/var/lib/amavis'; |
| 10 |
$mydomain = '!change-mydomain-variable!.example.com';#intentionally bad deflt |
| 11 |
|
| 12 |
# Create debugging output - true: log to stderr; false: log to syslog/file |
| 13 |
@@ -747,7 +747,7 @@ |
| 14 |
# |
| 15 |
# Receiving mail related |
| 16 |
|
| 17 |
- # $unix_socketname = '/var/amavis/amavisd.sock'; # old amavis client protocol |
| 18 |
+ # $unix_socketname = '/var/lib/amavis/amavisd.sock'; # old amavis client protocol |
| 19 |
# $inet_socket_port = 10024; # accept SMTP on this TCP port |
| 20 |
# $inet_socket_port = [10024,10026,10027]; # ...possibly on more than one |
| 21 |
$inet_socket_bind = '127.0.0.1'; # limit socket bind to loopback interface |
| 22 |
@@ -757,8 +757,8 @@ |
| 23 |
10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ); |
| 24 |
$originating = 0; # a boolean, initially reflects @mynetworks, |
| 25 |
# but may be modified later through a policy bank |
| 26 |
- $notify_method = 'smtp:[127.0.0.1]:10025'; |
| 27 |
- $forward_method = 'smtp:[127.0.0.1]:10025'; |
| 28 |
+ $notify_method = 'smtp:[127.0.0.1]:10026'; |
| 29 |
+ $forward_method = 'smtp:[127.0.0.1]:10026'; |
| 30 |
$resend_method = undef; # overrides $forward_method on defanging if nonempty |
| 31 |
$release_method = undef; # overrides $notify_method on releasing |
| 32 |
# from quarantine if nonempty |
| 33 |
@@ -1023,7 +1023,7 @@ |
| 34 |
X-Quarantine-ID X-Amavis-Alert X-Amavis-Hold X-Amavis-Modified |
| 35 |
X-Amavis-PenPals X-Amavis-OS-Fingerprint X-Amavis-PolicyBank |
| 36 |
X-Spam-Status X-Spam-Level X-Spam-Flag X-Spam-Score |
| 37 |
- X-Spam-Report X-Spam-Checker-Version X-Spam-Tests |
| 38 |
+ X-Spam-Report X-Spam-Checker-Version X-Spam-Tests X-Scanned-By |
| 39 |
X-CRM114-Status X-CRM114-CacheID X-CRM114-Notice X-CRM114-Action |
| 40 |
X-DSPAM-Result X-DSPAM-Class X-DSPAM-Signature X-DSPAM-Processed |
| 41 |
X-DSPAM-Confidence X-DSPAM-Probability X-DSPAM-User X-DSPAM-Factors |
| 42 |
@@ -2732,12 +2732,12 @@ |
| 43 |
# The $hashref argument is returned for convenience, so that one can do |
| 44 |
# for example: |
| 45 |
# $per_recip_whitelist_sender_lookup_tables = { |
| 46 |
-# '.my1.example.com' => read_hash({},'/var/amavis/my1-example-com.wl'), |
| 47 |
-# '.my2.example.com' => read_hash({},'/var/amavis/my2-example-com.wl') } |
| 48 |
+# '.my1.example.com' => read_hash({},'/var/lib/amavis/my1-example-com.wl'), |
| 49 |
+# '.my2.example.com' => read_hash({},'/var/lib/amavis/my2-example-com.wl') } |
| 50 |
# or even simpler: |
| 51 |
# $per_recip_whitelist_sender_lookup_tables = { |
| 52 |
-# '.my1.example.com' => read_hash('/var/amavis/my1-example-com.wl'), |
| 53 |
-# '.my2.example.com' => read_hash('/var/amavis/my2-example-com.wl') } |
| 54 |
+# '.my1.example.com' => read_hash('/var/lib/amavis/my1-example-com.wl'), |
| 55 |
+# '.my2.example.com' => read_hash('/var/lib/amavis/my2-example-com.wl') } |
| 56 |
# |
| 57 |
sub read_hash(@) { |
| 58 |
unshift(@_,{}) if !ref $_[0]; # first argument is optional, defaults to {} |
| 59 |
@@ -13608,7 +13608,7 @@ |
| 60 |
Amavis::Lookup::RE->new(@$Amavis::Conf::map_full_type_to_short_type_re); |
| 61 |
|
| 62 |
# default location of the config file if none specified |
| 63 |
-push(@config_files, '/etc/amavisd.conf') if !@config_files; |
| 64 |
+push(@config_files, '/etc/amavisd/amavisd.conf') if !@config_files; |
| 65 |
# Read and evaluate config files, which may override default settings |
| 66 |
Amavis::Conf::include_config_files(@config_files); |
| 67 |
Amavis::Conf::supply_after_defaults(); |
| 68 |
@@ -14075,7 +14075,7 @@ |
| 69 |
# set up Net::Server configuration |
| 70 |
my($server) = Amavis->new({ |
| 71 |
# command args to be used after HUP must be untainted, deflt: [$0,@ARGV] |
| 72 |
- # commandline => ['/usr/local/sbin/amavisd','-c',$config_file[0] ], |
| 73 |
+ # commandline => ['/usr/sbin/amavisd','-c',$config_file[0] ], |
| 74 |
commandline => [], # disable |
| 75 |
port => \@listen_sockets, # listen on the these sockets (Unix or inet) |
| 76 |
# limit socket bind (e.g. to the loopback interface) |
| 77 |
@@ -14172,7 +14172,7 @@ |
| 78 |
|
| 79 |
#sub lock_stat($) { |
| 80 |
# my($label) = @_; |
| 81 |
-# my($s) = qx'/usr/local/bin/db_stat-4.2 -c -h /var/amavis/db | /usr/local/bin/perl -ne \'$a{$2}=$1 if /^(\d+)\s+Total number of locks (requested|released)/; END {printf("%d, %d\n",$a{requested}, $a{requested}-$a{released})}\''; |
| 82 |
+# my($s) = qx'/usr/bin/db_stat-4.2 -c -h /var/lib/amavis/db | /usr/bin/perl -ne \'$a{$2}=$1 if /^(\d+)\s+Total number of locks (requested|released)/; END {printf("%d, %d\n",$a{requested}, $a{requested}-$a{released})}\''; |
| 83 |
# do_log(0, "lock_stat %s: %s", $label,$s); |
| 84 |
#} |
| 85 |
|
| 86 |
@@ -15564,9 +15564,9 @@ |
| 87 |
# Required AM.PDP fields are: request, tempdir, sender, recipient(s) |
| 88 |
# request=AM.PDP |
| 89 |
# version_client=n (currently ignored) |
| 90 |
- # tempdir=/var/amavis/amavis-milter-MWZmu9Di |
| 91 |
+ # tempdir=/var/lib/amavis/amavis-milter-MWZmu9Di |
| 92 |
# tempdir_removed_by=client (tempdir_removed_by=server is a default) |
| 93 |
- # mail_file=/var/amavis/am.../email.txt (defaults to tempdir/email.txt) |
| 94 |
+ # mail_file=/var/lib/amavis/am.../email.txt (defaults to tempdir/email.txt) |
| 95 |
# sender=<foo@example.com> |
| 96 |
# recipient=<bar1@example.net> |
| 97 |
# recipient=<bar2@example.net> |
| 98 |
@@ -21714,7 +21714,7 @@ |
| 99 |
} |
| 100 |
|
| 101 |
# expects spamd started like the following: |
| 102 |
-# spamd -H /var/amavis/home -r /var/amavis/home/spamd.pid -s user \ |
| 103 |
+# spamd -H /var/lib/amavis/home -r /var/lib/amavis/home/spamd.pid -s user \ |
| 104 |
# -u vscan -g vscan -d -x -P --min-children=25 --max-children=25 |
| 105 |
|
| 106 |
sub check { |
| 107 |
diff -Naur amavisd-new-2.6.4/amavisd-agent amavisd-new-2.6.4.oden/amavisd-agent |
| 108 |
--- amavisd-new-2.6.4/amavisd-agent 2009-06-18 21:17:30.000000000 +0200 |
| 109 |
+++ amavisd-new-2.6.4.oden/amavisd-agent 2009-06-27 12:48:01.000000000 +0200 |
| 110 |
@@ -50,7 +50,7 @@ |
| 111 |
|
| 112 |
my($dbfile) = 'snmp.db'; |
| 113 |
my($db_home) = # DB databases directory |
| 114 |
- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; |
| 115 |
+ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/lib/amavis/db'; |
| 116 |
|
| 117 |
my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional |
| 118 |
my($repeatcount); # -c, repeat count (when defined) |
| 119 |
diff -Naur amavisd-new-2.6.4/amavisd.conf amavisd-new-2.6.4.oden/amavisd.conf |
| 120 |
--- amavisd-new-2.6.4/amavisd.conf 2009-06-25 14:38:47.000000000 +0200 |
| 121 |
+++ amavisd-new-2.6.4.oden/amavisd.conf 2009-06-27 12:50:28.000000000 +0200 |
| 122 |
@@ -15,15 +15,15 @@ |
| 123 |
# $bypass_decode_parts = 1; # controls running of decoders&dearchivers |
| 124 |
|
| 125 |
$max_servers = 2; # num of pre-forked children (2..30 is common), -m |
| 126 |
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u |
| 127 |
-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g |
| 128 |
+$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u |
| 129 |
+$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g |
| 130 |
|
| 131 |
-$mydomain = 'example.com'; # a convenient default for other settings |
| 132 |
+$mydomain = 'localhost.localdomain'; # a convenient default for other settings |
| 133 |
|
| 134 |
-# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H |
| 135 |
+# $MYHOME = '/var/lib/amavis'; # a convenient default for other settings, -H |
| 136 |
$TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T |
| 137 |
$ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc. |
| 138 |
-$QUARANTINEDIR = '/var/virusmails'; # -Q |
| 139 |
+$QUARANTINEDIR = '/var/spool/amavis/virusmails'; # -Q |
| 140 |
# $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine |
| 141 |
# $release_format = 'resend'; # 'attach', 'plain', 'resend' |
| 142 |
# $report_format = 'arf'; # 'attach', 'plain', 'resend', 'arf' |
| 143 |
@@ -32,8 +32,9 @@ |
| 144 |
|
| 145 |
# $db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D |
| 146 |
# $helpers_home = "$MYHOME/var"; # working directory for SpamAssassin, -S |
| 147 |
-# $lock_file = "$MYHOME/var/amavisd.lock"; # -L |
| 148 |
-# $pid_file = "$MYHOME/var/amavisd.pid"; # -P |
| 149 |
+# $lock_file = "$MYHOME/var/lib/amavisd.lock"; # -L |
| 150 |
+# $pid_file = "$MYHOME/var/lib/amavisd.pid"; # -P |
| 151 |
+ |
| 152 |
#NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually |
| 153 |
|
| 154 |
$log_level = 0; # verbosity 0..5, -d |
| 155 |
@@ -58,7 +59,7 @@ |
| 156 |
$unix_socketname = "$MYHOME/amavisd.sock"; # amavisd-release or amavis-milter |
| 157 |
# option(s) -p overrides $inet_socket_port and $unix_socketname |
| 158 |
|
| 159 |
-$inet_socket_port = 10024; # listen on this local TCP port(s) |
| 160 |
+$inet_socket_port = 10025; # listen on this local TCP port(s) |
| 161 |
# $inet_socket_port = [10024,10026]; # listen on multiple TCP ports |
| 162 |
|
| 163 |
$policy_bank{'MYNETS'} = { # mail originating from @mynetworks |
| 164 |
@@ -94,9 +95,9 @@ |
| 165 |
auth_required_release => 0, # do not require secret_id for amavisd-release |
| 166 |
}; |
| 167 |
|
| 168 |
-$sa_tag_level_deflt = 2.0; # add spam info headers if at, or above that level |
| 169 |
-$sa_tag2_level_deflt = 6.2; # add 'spam detected' headers at that level |
| 170 |
-$sa_kill_level_deflt = 6.9; # triggers spam evasive actions (e.g. blocks mail) |
| 171 |
+$sa_tag_level_deflt = 1.0; # add spam info headers if at, or above that level |
| 172 |
+$sa_tag2_level_deflt = 4.7; # add 'spam detected' headers at that level |
| 173 |
+$sa_kill_level_deflt = 4.7; # triggers spam evasive actions (e.g. blocks mail) |
| 174 |
$sa_dsn_cutoff_level = 10; # spam level beyond which a DSN is not sent |
| 175 |
$sa_crediblefrom_dsn_cutoff_level = 18; # likewise, but for a likely valid From |
| 176 |
# $sa_quarantine_cutoff_level = 25; # spam level beyond which quarantine is off |
| 177 |
@@ -104,7 +105,7 @@ |
| 178 |
$penpals_threshold_high = $sa_kill_level_deflt; # don't waste time on hi spam |
| 179 |
$bounce_killer_score = 100; # spam score points to add for joe-jobbed bounces |
| 180 |
|
| 181 |
-$sa_mail_body_size_limit = 400*1024; # don't waste time on SA if mail is larger |
| 182 |
+$sa_mail_body_size_limit = 512*1024; # don't waste time on SA if mail is larger |
| 183 |
$sa_local_tests_only = 0; # only tests which do not require internet access? |
| 184 |
|
| 185 |
# @lookup_sql_dsn = |
| 186 |
@@ -136,7 +137,7 @@ |
| 187 |
$MAXLEVELS = 14; |
| 188 |
$MAXFILES = 1500; |
| 189 |
$MIN_EXPANSION_QUOTA = 100*1024; # bytes (default undef, not enforced) |
| 190 |
-$MAX_EXPANSION_QUOTA = 300*1024*1024; # bytes (default undef, not enforced) |
| 191 |
+$MAX_EXPANSION_QUOTA = 512*1024*1024; # bytes (default undef, not enforced) |
| 192 |
|
| 193 |
$sa_spam_subject_tag = '***SPAM*** '; |
| 194 |
$defang_virus = 1; # MIME-wrap passed infected mail |
| 195 |
@@ -151,12 +152,12 @@ |
| 196 |
|
| 197 |
# $myhostname = 'host.example.com'; # must be a fully-qualified domain name! |
| 198 |
|
| 199 |
-# $notify_method = 'smtp:[127.0.0.1]:10025'; |
| 200 |
-# $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter! |
| 201 |
+# $notify_method = 'smtp:[127.0.0.1]:10026'; |
| 202 |
+# $forward_method = 'smtp:[127.0.0.1]:10026'; # set to undef with milter! |
| 203 |
|
| 204 |
# $final_virus_destiny = D_DISCARD; |
| 205 |
# $final_banned_destiny = D_BOUNCE; |
| 206 |
-# $final_spam_destiny = D_BOUNCE; |
| 207 |
+# $final_spam_destiny = D_PASS; |
| 208 |
# $final_bad_header_destiny = D_PASS; |
| 209 |
# $bad_header_quarantine_method = undef; |
| 210 |
|
| 211 |
@@ -271,7 +272,7 @@ |
| 212 |
[qr'^(inkjetplanet|marketopt|MakeMoney)\d*@'i => 5.0], |
| 213 |
), |
| 214 |
|
| 215 |
-# read_hash("/var/amavis/sender_scores_sitewide"), |
| 216 |
+# read_hash("/var/lib/amavis/sender_scores_sitewide"), |
| 217 |
|
| 218 |
{ # a hash-type lookup table (associative array) |
| 219 |
'nobody@cert.org' => -3.0, |
| 220 |
@@ -361,7 +362,7 @@ |
| 221 |
|
| 222 |
# ### http://www.clamav.net/ |
| 223 |
# ['ClamAV-clamd', |
| 224 |
-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], |
| 225 |
+# \&ask_daemon, ["CONTSCAN {}\n", "/var/lib/clamav/clamd.socket"], |
| 226 |
# qr/\bOK$/m, qr/\bFOUND$/m, |
| 227 |
# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], |
| 228 |
# # NOTE: run clamd under the same user as amavisd, or run it under its own |
| 229 |
@@ -418,7 +419,7 @@ |
| 230 |
# pack('N',0). # content size |
| 231 |
# pack('N',0), |
| 232 |
# '/var/drweb/run/drwebd.sock', |
| 233 |
-# # '/var/amavis/var/run/drwebd.sock', # suitable for chroot |
| 234 |
+# # '/var/lib/amavis/var/run/drwebd.sock', # suitable for chroot |
| 235 |
# # '/usr/local/drweb/run/drwebd.sock', # FreeBSD drweb ports default |
| 236 |
# # '127.0.0.1:3000', # or over an inet socket |
| 237 |
# ], |
| 238 |
@@ -457,12 +458,12 @@ |
| 239 |
'/opt/AVP/avpdc', 'avpdc' ], |
| 240 |
"-f=$TEMPBASE {}", [0,8], [3,4,5,6], qr/infected: ([^\r\n]+)/m ], |
| 241 |
# change the startup-script in /etc/init.d/kavd to: |
| 242 |
- # DPARMS="-* -Y -dl -f=/var/amavis /var/amavis" |
| 243 |
- # (or perhaps: DPARMS="-I0 -Y -* /var/amavis" ) |
| 244 |
- # adjusting /var/amavis above to match your $TEMPBASE. |
| 245 |
- # The '-f=/var/amavis' is needed if not running it as root, so it |
| 246 |
+ # DPARMS="-* -Y -dl -f=/var/lib/amavis /var/lib/amavis" |
| 247 |
+ # (or perhaps: DPARMS="-I0 -Y -* /var/lib/amavis" ) |
| 248 |
+ # adjusting /var/lib/amavis above to match your $TEMPBASE. |
| 249 |
+ # The '-f=/var/lib/amavis' is needed if not running it as root, so it |
| 250 |
# can find, read, and write its pid file, etc., see 'man kavdaemon'. |
| 251 |
- # defUnix.prf: there must be an entry "*/var/amavis" (or whatever |
| 252 |
+ # defUnix.prf: there must be an entry "*/var/lib/amavis" (or whatever |
| 253 |
# directory $TEMPBASE specifies) in the 'Names=' section. |
| 254 |
# cd /opt/AVP/DaemonClients; configure; cd Sample; make |
| 255 |
# cp AvpDaemonClient /opt/AVP/ |
| 256 |
diff -Naur amavisd-new-2.6.4/amavisd.conf-default amavisd-new-2.6.4.oden/amavisd.conf-default |
| 257 |
--- amavisd-new-2.6.4/amavisd.conf-default 2009-06-25 14:38:32.000000000 +0200 |
| 258 |
+++ amavisd-new-2.6.4.oden/amavisd.conf-default 2009-06-27 12:48:01.000000000 +0200 |
| 259 |
@@ -24,7 +24,7 @@ |
| 260 |
# $snmp_location = ''; |
| 261 |
# $daemon_user = undef; |
| 262 |
# $daemon_group = undef; |
| 263 |
-# $MYHOME = '/var/amavis'; |
| 264 |
+# $MYHOME = '/var/lib/amavis'; |
| 265 |
# $TEMPBASE = $MYHOME; # after-default |
| 266 |
# $db_home = "$MYHOME/db"; # after-default |
| 267 |
# $pid_file = "$MYHOME/amavisd.pid"; # after-default |
| 268 |
@@ -112,7 +112,7 @@ |
| 269 |
|
| 270 |
## MAIL FORWARDING AND DKIM SIGNING |
| 271 |
|
| 272 |
-# $forward_method = 'smtp:[127.0.0.1]:10025'; |
| 273 |
+# $forward_method = 'smtp:[127.0.0.1]:10026'; |
| 274 |
# $resend_method = undef; # falls back to $forward_method |
| 275 |
# $always_bcc = undef; |
| 276 |
|
| 277 |
@@ -164,7 +164,7 @@ |
| 278 |
|
| 279 |
## NOTIFICATIONS (DSN, admin, recip) |
| 280 |
|
| 281 |
-# $notify_method = 'smtp:[127.0.0.1]:10025'; |
| 282 |
+# $notify_method = 'smtp:[127.0.0.1]:10026'; |
| 283 |
|
| 284 |
# $propagate_dsn_if_possible = 1; |
| 285 |
# $terminate_dsn_on_notify_success = 0; |
| 286 |
diff -Naur amavisd-new-2.6.4/amavisd.conf-sample amavisd-new-2.6.4.oden/amavisd.conf-sample |
| 287 |
--- amavisd-new-2.6.4/amavisd.conf-sample 2009-06-25 14:38:38.000000000 +0200 |
| 288 |
+++ amavisd-new-2.6.4.oden/amavisd.conf-sample 2009-06-27 12:50:06.000000000 +0200 |
| 289 |
@@ -63,7 +63,7 @@ |
| 290 |
# $MYHOME serves as a quick default for some other configuration settings. |
| 291 |
# More refined control is available with each individual setting further down. |
| 292 |
# $MYHOME is not used directly by the program. No trailing slash! |
| 293 |
-#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis'), -H |
| 294 |
+#$MYHOME = '/var/lib/amavis'; # (default is '/var/lib/amavis'), -H |
| 295 |
|
| 296 |
# $mydomain serves as a quick default for some other configuration settings. |
| 297 |
# More refined control is available with each individual setting further down. |
| 298 |
@@ -74,14 +74,14 @@ |
| 299 |
|
| 300 |
# Set the user and group to which the daemon will change if started as root |
| 301 |
# (otherwise just keeps the UID unchanged, and these settings have no effect): |
| 302 |
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u |
| 303 |
-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g |
| 304 |
+$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u |
| 305 |
+$daemon_group = 'amavis'; # (no default; customary: vscan or amavis or sweep), -g |
| 306 |
|
| 307 |
# Runtime working directory (cwd), and a place where |
| 308 |
# temporary directories for unpacking mail are created. |
| 309 |
# (no trailing slash, may be a scratch file system) |
| 310 |
$TEMPBASE = $MYHOME; # (must be set if other config vars use is), -T |
| 311 |
-#$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir /var/amavis clean? |
| 312 |
+#$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir /var/lib/amavis clean? |
| 313 |
|
| 314 |
#$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D |
| 315 |
|
| 316 |
@@ -111,7 +111,7 @@ |
| 317 |
# POSTFIX, or SENDMAIL in dual-MTA setup, or EXIM V4 |
| 318 |
# (set host and port number as required; host can be specified |
| 319 |
# as an IP address or a DNS name (A or CNAME, but MX is ignored) |
| 320 |
-#$forward_method = 'smtp:[127.0.0.1]:10025'; # where to forward checked mail |
| 321 |
+#$forward_method = 'smtp:[127.0.0.1]:10026'; # where to forward checked mail |
| 322 |
#$notify_method = $forward_method; # where to submit notifications |
| 323 |
|
| 324 |
#$os_fingerprint_method = 'p0f:127.0.0.1:2345'; # query p0f-analyzer.pl |
| 325 |
@@ -210,7 +210,7 @@ |
| 326 |
# ( [qw( .example.com !host.sub.example.net .sub.example.net )] ); |
| 327 |
# @local_domains_maps = ( new_RE( qr'[@.]example\.com$'i ) ); # using regexp |
| 328 |
# @local_domains_maps = ( read_hash("$MYHOME/local_domains") ); # using hash |
| 329 |
-# perhaps combined with Postfix: mydestination = /var/amavis/local_domains |
| 330 |
+# perhaps combined with Postfix: mydestination = /var/lib/amavis/local_domains |
| 331 |
# for debugging purposes: dump_hash($local_domains_maps[0]); |
| 332 |
# |
| 333 |
# Section II - MTA specific (defaults should be ok) |
| 334 |
@@ -230,7 +230,7 @@ |
| 335 |
|
| 336 |
# SMTP SERVER (INPUT) PROTOCOL SETTINGS (e.g. with Postfix, Exim v4, ...) |
| 337 |
# (used when MTA is configured to pass mail to amavisd via SMTP or LMTP) |
| 338 |
-$inet_socket_port = 10024; # accept SMTP on this local TCP port |
| 339 |
+$inet_socket_port = 10025; # accept SMTP on this local TCP port |
| 340 |
# (default is undef, i.e. disabled) |
| 341 |
# multiple ports may be provided: $inet_socket_port = [10024, 10026, 10028]; |
| 342 |
|
| 343 |
@@ -502,7 +502,7 @@ |
| 344 |
# |
| 345 |
$final_virus_destiny = D_DISCARD; # (defaults to D_DISCARD) |
| 346 |
$final_banned_destiny = D_BOUNCE; # (defaults to D_BOUNCE) |
| 347 |
-$final_spam_destiny = D_BOUNCE; # (defaults to D_BOUNCE) |
| 348 |
+$final_spam_destiny = D_PASS; # (defaults to D_BOUNCE) |
| 349 |
$final_bad_header_destiny = D_PASS; # (defaults to D_PASS) |
| 350 |
|
| 351 |
# to explicitly list all (or most) possible contents category (ccat) keys: |
| 352 |
@@ -581,7 +581,7 @@ |
| 353 |
|
| 354 |
# Notify virus (or banned files or bad headers) RECIPIENT? |
| 355 |
# (not very useful, but some policies demand it) |
| 356 |
-#$warnvirusrecip = 1; # (defaults to false (undef)) |
| 357 |
+$warnvirusrecip = 1; # (defaults to false (undef)) |
| 358 |
#$warnbannedrecip = 1; # (defaults to false (undef)) |
| 359 |
#$warnbadhrecip = 1; # (defaults to false (undef)) |
| 360 |
|
| 361 |
@@ -603,6 +603,9 @@ |
| 362 |
qr'tanatos|lentin|bridex|mimail|trojan\.dropper|dumaru|parite|spaces'i, |
| 363 |
qr'dloader|galil|gibe|swen|netwatch|bics|sbrowse|sober|rox|val(hal)?la'i, |
| 364 |
qr'frethem|sircam|be?agle|tanx|mydoom|novarg|shimg|netsky|somefool|moodown'i, |
| 365 |
+ qr'badtrans|magistr|bagle'i, |
| 366 |
+ qr'mthredir|sdboot.gen|funlove|yaha|zafi|gibe|lovgate|nyxem|mabutu'i |
| 367 |
+ qr'plexus|mytob|SCO'i, |
| 368 |
qr'@mm|@MM', # mass mailing viruses as labeled by f-prot and uvscan |
| 369 |
qr'Worm'i, # worms as labeled by ClamAV, Kaspersky, etc |
| 370 |
# [qr'^(EICAR|Joke\.|Junk\.)'i => 0], |
| 371 |
@@ -694,7 +697,7 @@ |
| 372 |
# or a directory (no trailing slash) |
| 373 |
# (the default value is undef, meaning no quarantine) |
| 374 |
# |
| 375 |
-$QUARANTINEDIR = '/var/virusmails'; # -Q |
| 376 |
+$QUARANTINEDIR = '/var/spool/amavis/virusmails'; # -Q |
| 377 |
|
| 378 |
#$quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine |
| 379 |
|
| 380 |
@@ -1442,7 +1445,7 @@ |
| 381 |
[qr'^(inkjetplanet|marketopt|MakeMoney)\d*@'i => 5.0], |
| 382 |
), |
| 383 |
|
| 384 |
-# read_hash("/var/amavis/sender_scores_sitewide"), |
| 385 |
+# read_hash("/var/lib/amavis/sender_scores_sitewide"), |
| 386 |
|
| 387 |
{ # a hash-type lookup table (associative array) |
| 388 |
'nobody@cert.org' => -3.0, |
| 389 |
@@ -1659,7 +1662,7 @@ |
| 390 |
# but never less than MIN_EXPANSION_QUOTA |
| 391 |
# |
| 392 |
$MIN_EXPANSION_QUOTA = 100*1024; # bytes (default undef, not enforced) |
| 393 |
-$MAX_EXPANSION_QUOTA = 300*1024*1024; # bytes (default undef, not enforced) |
| 394 |
+$MAX_EXPANSION_QUOTA = 512*1024*1024; # bytes (default undef, not enforced) |
| 395 |
$MIN_EXPANSION_FACTOR = 5; # times original mail size (default is 5) |
| 396 |
$MAX_EXPANSION_FACTOR = 500; # times original mail size (default is 500) |
| 397 |
|
| 398 |
@@ -1748,14 +1751,14 @@ |
| 399 |
#$sa_auto_whitelist = 1; # turn on AWL in SA 2.63 or older (irrelevant |
| 400 |
# for SA 3.0, its cf option is use_auto_whitelist) |
| 401 |
|
| 402 |
-$sa_mail_body_size_limit = 400*1024; # don't waste time on SA if mail is larger |
| 403 |
+$sa_mail_body_size_limit = 512*1024; # don't waste time on SA if mail is larger |
| 404 |
# (less than 1% of spam is > 64k) |
| 405 |
# default: undef, no limitations |
| 406 |
|
| 407 |
# default values, customarily used in the @spam_*_level_maps as the last entry |
| 408 |
$sa_tag_level_deflt = 2.0; # add spam info headers if at, or above that level; |
| 409 |
# undef is interpreted as lower than any spam level |
| 410 |
-$sa_tag2_level_deflt = 6.31;# add 'spam detected' headers at that level to |
| 411 |
+$sa_tag2_level_deflt = 4.7;# add 'spam detected' headers at that level to |
| 412 |
# passed mail, adding address extensions; |
| 413 |
$sa_kill_level_deflt = $sa_tag2_level_deflt; # triggers spam evasive actions |
| 414 |
# at or above that level: bounce/reject/drop, |
| 415 |
@@ -1824,7 +1827,7 @@ |
| 416 |
# < dsn_cutoff_level <= quarantine_cutoff_level |
| 417 |
|
| 418 |
# string to prepend to Subject header field when message exceeds tag2 level |
| 419 |
-#$sa_spam_subject_tag = '***SPAM*** '; # (defaults to undef, disabled) |
| 420 |
+$sa_spam_subject_tag = '***SPAM*** '; # (defaults to undef, disabled) |
| 421 |
# (only seen when spam is passed and recipient is |
| 422 |
# in local_domains*) |
| 423 |
# more examples, using @*_maps directly: |
| 424 |
@@ -1932,7 +1935,7 @@ |
| 425 |
|
| 426 |
# ### http://www.clamav.net/ |
| 427 |
# ['ClamAV-clamd', |
| 428 |
-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], |
| 429 |
+# \&ask_daemon, ["CONTSCAN {}\n", "/var/lib/clamav/clamd.socket"], |
| 430 |
# qr/\bOK$/m, qr/\bFOUND$/m, |
| 431 |
# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], |
| 432 |
# # NOTE: run clamd under the same user as amavisd, or run it under its own |
| 433 |
@@ -1989,7 +1992,7 @@ |
| 434 |
# pack('N',0). # content size |
| 435 |
# pack('N',0), |
| 436 |
# '/var/drweb/run/drwebd.sock', |
| 437 |
-# # '/var/amavis/var/run/drwebd.sock', # suitable for chroot |
| 438 |
+# # '/var/lib/amavis/var/run/drwebd.sock', # suitable for chroot |
| 439 |
# # '/usr/local/drweb/run/drwebd.sock', # FreeBSD drweb ports default |
| 440 |
# # '127.0.0.1:3000', # or over an inet socket |
| 441 |
# ], |
| 442 |
@@ -2028,12 +2031,12 @@ |
| 443 |
'/opt/AVP/avpdc', 'avpdc' ], |
| 444 |
"-f=$TEMPBASE {}", [0,8], [3,4,5,6], qr/infected: ([^\r\n]+)/m ], |
| 445 |
# change the startup-script in /etc/init.d/kavd to: |
| 446 |
- # DPARMS="-* -Y -dl -f=/var/amavis /var/amavis" |
| 447 |
- # (or perhaps: DPARMS="-I0 -Y -* /var/amavis" ) |
| 448 |
- # adjusting /var/amavis above to match your $TEMPBASE. |
| 449 |
- # The '-f=/var/amavis' is needed if not running it as root, so it |
| 450 |
+ # DPARMS="-* -Y -dl -f=/var/lib/amavis /var/lib/amavis" |
| 451 |
+ # (or perhaps: DPARMS="-I0 -Y -* /var/lib/amavis" ) |
| 452 |
+ # adjusting /var/lib/amavis above to match your $TEMPBASE. |
| 453 |
+ # The '-f=/var/lib/amavis' is needed if not running it as root, so it |
| 454 |
# can find, read, and write its pid file, etc., see 'man kavdaemon'. |
| 455 |
- # defUnix.prf: there must be an entry "*/var/amavis" (or whatever |
| 456 |
+ # defUnix.prf: there must be an entry "*/var/lib/amavis" (or whatever |
| 457 |
# directory $TEMPBASE specifies) in the 'Names=' section. |
| 458 |
# cd /opt/AVP/DaemonClients; configure; cd Sample; make |
| 459 |
# cp AvpDaemonClient /opt/AVP/ |
| 460 |
@@ -2448,7 +2451,7 @@ |
| 461 |
# amavis_auth_user => 'amavisd', amavis_auth_pass = 'tOpsecretX', |
| 462 |
# av_scanners => [ # provide only 'free' scanners |
| 463 |
# ['ClamAV-clamd', |
| 464 |
-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], |
| 465 |
+# \&ask_daemon, ["CONTSCAN {}\n", "/var/lib/clamav/clamd.socket"], |
| 466 |
# qr/\bOK$/, qr/\bFOUND$/, |
| 467 |
# qr/^.*?: (?!Infected Archive)(.*) FOUND$/, |
| 468 |
# ], |
| 469 |
diff -Naur amavisd-new-2.6.4/amavisd-nanny amavisd-new-2.6.4.oden/amavisd-nanny |
| 470 |
--- amavisd-new-2.6.4/amavisd-nanny 2009-06-25 19:57:13.000000000 +0200 |
| 471 |
+++ amavisd-new-2.6.4.oden/amavisd-nanny 2009-06-27 12:48:01.000000000 +0200 |
| 472 |
@@ -58,7 +58,7 @@ |
| 473 |
|
| 474 |
my($dbfile) = 'nanny.db'; |
| 475 |
my($db_home) = # DB databases directory |
| 476 |
- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; |
| 477 |
+ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/lib/amavis/db'; |
| 478 |
my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional |
| 479 |
my($repeatcount); # -c, repeat count (when defined) |
| 480 |
|
| 481 |
diff -Naur amavisd-new-2.6.4/amavisd-release amavisd-new-2.6.4.oden/amavisd-release |
| 482 |
--- amavisd-new-2.6.4/amavisd-release 2008-08-05 18:49:30.000000000 +0200 |
| 483 |
+++ amavisd-new-2.6.4.oden/amavisd-release 2009-06-27 12:48:01.000000000 +0200 |
| 484 |
@@ -11,7 +11,7 @@ |
| 485 |
# To be placed in amavisd.conf: |
| 486 |
# $interface_policy{'SOCK'} = 'AM.PDP'; |
| 487 |
# $policy_bank{'AM.PDP'} = {protocol=>'AM.PDP'}; |
| 488 |
-# $unix_socketname='/var/amavis/amavisd.sock'; |
| 489 |
+# $unix_socketname='/var/lib/amavis/amavisd.sock'; |
| 490 |
#or: |
| 491 |
# $interface_policy{'9998'} = 'AM.PDP'; |
| 492 |
# $policy_bank{'AM.PDP'} = {protocol=>'AM.PDP'}; |
| 493 |
@@ -79,7 +79,7 @@ |
| 494 |
|
| 495 |
$log_level = 1; |
| 496 |
# $socketname = '127.0.0.1:9998'; |
| 497 |
- $socketname = '/var/amavis/amavisd.sock'; |
| 498 |
+ $socketname = '/var/lib/amavis/amavisd.sock'; |
| 499 |
|
| 500 |
sub sanitize_str { |
| 501 |
my($str, $keep_eol) = @_; |
| 502 |
diff -Naur amavisd-new-2.6.4/helper-progs/amavis-milter.c amavisd-new-2.6.4.oden/helper-progs/amavis-milter.c |
| 503 |
--- amavisd-new-2.6.4/helper-progs/amavis-milter.c 2008-06-27 15:31:45.000000000 +0200 |
| 504 |
+++ amavisd-new-2.6.4.oden/helper-progs/amavis-milter.c 2009-06-27 12:48:01.000000000 +0200 |
| 505 |
@@ -61,7 +61,7 @@ |
| 506 |
#define SOCKBUFLEN 8192 |
| 507 |
|
| 508 |
#ifndef RUNTIME_DIR |
| 509 |
-# define RUNTIME_DIR "/var/amavis" |
| 510 |
+# define RUNTIME_DIR "/var/lib/amavis" |
| 511 |
#endif |
| 512 |
|
| 513 |
#ifndef AMAVISD_SOCKET |
| 514 |
@@ -923,7 +923,7 @@ |
| 515 |
fprintf(stderr, "Options -g, -x, -D are allowed for compatibility but ignored.\n"); |
| 516 |
fprintf(stderr, "\n"); |
| 517 |
fprintf(stderr, "This helper prgram (milter daemon) is normally started as:\n"); |
| 518 |
- fprintf(stderr, "# su amavis -c '/usr/local/sbin/amavis-milter -p local:/var/amavis/amavis-milter.sock'\n"); |
| 519 |
+ fprintf(stderr, "# su amavis -c '/usr/sbin/amavis-milter -p local:/var/lib/amavis/amavis-milter.sock'\n"); |
| 520 |
}; |
| 521 |
|
| 522 |
int |
| 523 |
diff -Naur amavisd-new-2.6.4/helper-progs/amavis.pl amavisd-new-2.6.4.oden/helper-progs/amavis.pl |
| 524 |
--- amavisd-new-2.6.4/helper-progs/amavis.pl 2004-12-23 02:27:11.000000000 +0100 |
| 525 |
+++ amavisd-new-2.6.4.oden/helper-progs/amavis.pl 2009-06-27 12:48:01.000000000 +0200 |
| 526 |
@@ -7,7 +7,7 @@ |
| 527 |
# Usage: |
| 528 |
# amavis.pl sender recip1 recip2 ... < message.txt |
| 529 |
# To be placed in amavisd.conf: |
| 530 |
-# $protocol='AM.PDP'; $unix_socketname='/var/amavis/amavisd.sock'; |
| 531 |
+# $protocol='AM.PDP'; $unix_socketname='/var/lib/amavis/amavisd.sock'; |
| 532 |
# |
| 533 |
# |
| 534 |
# Author: Mark Martinec <mark.martinec@ijs.si> |
| 535 |
@@ -55,7 +55,7 @@ |
| 536 |
use vars qw($socketname); |
| 537 |
|
| 538 |
# $socketname = '127.0.0.1:9998'; |
| 539 |
- $socketname = '/var/amavis/amavisd.sock'; |
| 540 |
+ $socketname = '/var/lib/amavis/amavisd.sock'; |
| 541 |
|
| 542 |
sub sanitize_str { |
| 543 |
my($str, $keep_eol) = @_; |
| 544 |
@@ -139,7 +139,7 @@ |
| 545 |
$ctx->add(sprintf("%s %.9f %s", $$, Time::HiRes::time, join(',',@ARGV))); |
| 546 |
my($id) = substr($ctx->b64digest,0,16); $id =~ tr{+/}{-.}; |
| 547 |
|
| 548 |
- my($tempdir) = "/var/amavis/amavis-milter-$id"; |
| 549 |
+ my($tempdir) = "/var/lib/amavis/amavis-milter-$id"; |
| 550 |
my($fname) = "$tempdir/email.txt"; |
| 551 |
mkdir($tempdir,0750) or die "Can't create directory $tempdir: $!"; |
| 552 |
|
| 553 |
diff -Naur amavisd-new-2.6.4/helper-progs/config.h.in amavisd-new-2.6.4.oden/helper-progs/config.h.in |
| 554 |
--- amavisd-new-2.6.4/helper-progs/config.h.in 2006-03-06 01:26:08.000000000 +0100 |
| 555 |
+++ amavisd-new-2.6.4.oden/helper-progs/config.h.in 2009-06-27 12:48:01.000000000 +0200 |
| 556 |
@@ -2,10 +2,10 @@ |
| 557 |
/* config.h.in. Generated automatically from configure.in by autoheader. */ |
| 558 |
|
| 559 |
/* Where all temporary files and directories are created */ |
| 560 |
-#define RUNTIME_DIR "/var/amavis" |
| 561 |
+#define RUNTIME_DIR "/var/lib/amavis" |
| 562 |
|
| 563 |
/* The full path to the socket used for communication between client and daemon. */ |
| 564 |
-#define AMAVISD_SOCKET "/var/amavis/amavisd.sock" |
| 565 |
+#define AMAVISD_SOCKET "/var/lib/amavis/amavisd.sock" |
| 566 |
|
| 567 |
/* Amavis Header Tag */ |
| 568 |
#define X_HEADER_TAG "X-Virus-Scanned" |
| 569 |
diff -Naur amavisd-new-2.6.4/helper-progs/configure amavisd-new-2.6.4.oden/helper-progs/configure |
| 570 |
--- amavisd-new-2.6.4/helper-progs/configure 2004-04-11 01:51:53.000000000 +0200 |
| 571 |
+++ amavisd-new-2.6.4.oden/helper-progs/configure 2009-06-27 12:48:01.000000000 +0200 |
| 572 |
@@ -803,9 +803,9 @@ |
| 573 |
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
| 574 |
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
| 575 |
--with-sendmail=PATH specify location of Sendmail binary |
| 576 |
- --with-runtime-dir=DIR directory for runtime files /var/amavis |
| 577 |
+ --with-runtime-dir=DIR directory for runtime files /var/lib/amavis |
| 578 |
--with-sockname=PATH path to socket for daemon/client communication |
| 579 |
- /var/amavis/amavisd.sock |
| 580 |
+ /var/lib/amavis/amavisd.sock |
| 581 |
--with-user=LOGIN use LOGIN as the AMAVISD user |
| 582 |
--with-x-header-tag=X_HEADER_TAG use X_HEADER_TAG as the AMAVISD header tag |
| 583 |
--with-x-header-val=X_HEADER_VAL use X_HEADER_VAL as the AMAVISD header value |
| 584 |
@@ -2376,7 +2376,7 @@ |
| 585 |
fi; |
| 586 |
|
| 587 |
|
| 588 |
-runtime_dir=/var/amavis |
| 589 |
+runtime_dir=/var/lib/amavis |
| 590 |
echo "$as_me:$LINENO: checking for runtime directory" >&5 |
| 591 |
echo $ECHO_N "checking for runtime directory... $ECHO_C" >&6 |
| 592 |
|
| 593 |
diff -Naur amavisd-new-2.6.4/helper-progs/configure.in amavisd-new-2.6.4.oden/helper-progs/configure.in |
| 594 |
--- amavisd-new-2.6.4/helper-progs/configure.in 2004-04-11 01:51:52.000000000 +0200 |
| 595 |
+++ amavisd-new-2.6.4.oden/helper-progs/configure.in 2009-06-27 12:48:01.000000000 +0200 |
| 596 |
@@ -29,10 +29,10 @@ |
| 597 |
|
| 598 |
|
| 599 |
dnl Base directory for runtime files (log file, socket, temp dirs) |
| 600 |
-runtime_dir=/var/amavis |
| 601 |
+runtime_dir=/var/lib/amavis |
| 602 |
AC_MSG_CHECKING([for runtime directory]) |
| 603 |
AC_ARG_WITH(runtime-dir, |
| 604 |
- [ --with-runtime-dir=DIR directory for runtime files [/var/amavis]], |
| 605 |
+ [ --with-runtime-dir=DIR directory for runtime files [/var/lib/amavis]], |
| 606 |
runtime_dir=$withval) |
| 607 |
AC_MSG_RESULT([$runtime_dir]) |
| 608 |
AC_DEFINE_UNQUOTED(RUNTIME_DIR, "$runtime_dir", [ Where all temporary files and directories are created. ]) |
| 609 |
@@ -42,7 +42,7 @@ |
| 610 |
AC_MSG_CHECKING([socket name]) |
| 611 |
AC_ARG_WITH(sockname, |
| 612 |
[ --with-sockname=PATH path to socket for daemon/client communication |
| 613 |
- [/var/amavis/amavisd.sock]], |
| 614 |
+ [/var/lib/amavis/amavisd.sock]], |
| 615 |
sockname=$withval, sockname=$runtime_dir/amavisd.sock) |
| 616 |
|
| 617 |
AC_MSG_RESULT([$sockname]) |
| 618 |
diff -Naur amavisd-new-2.6.4/README_FILES/amavisd-new-docs.html amavisd-new-2.6.4.oden/README_FILES/amavisd-new-docs.html |
| 619 |
--- amavisd-new-2.6.4/README_FILES/amavisd-new-docs.html 2009-03-10 19:07:24.000000000 +0100 |
| 620 |
+++ amavisd-new-2.6.4.oden/README_FILES/amavisd-new-docs.html 2009-06-27 12:48:01.000000000 +0200 |
| 621 |
@@ -475,7 +475,7 @@ |
| 622 |
a mail from a local quarantine, and send it to MTA through its regular |
| 623 |
channels ($notify_method), bypassing re-checking.</p> |
| 624 |
|
| 625 |
-<p>By default it connects to socket /var/amavis/amavisd.sock, on which |
| 626 |
+<p>By default it connects to socket /var/lib/amavis/amavisd.sock, on which |
| 627 |
amavisd should be listening for AM.PDP protocol, but one can use inet socket |
| 628 |
instead of a Unix socket if there is a need to run <i>amavisd-release</i> |
| 629 |
from a remote host.</p> |
| 630 |
@@ -1877,7 +1877,7 @@ |
| 631 |
|
| 632 |
dnl Content filter: |
| 633 |
INPUT_MAIL_FILTER(`amavisd-milter', |
| 634 |
- `S=unix:/var/amavis/amavisd-milter.sock, F=T, T=S:10m;R:10m;E:10m') |
| 635 |
+ `S=unix:/var/lib/amavis/amavisd-milter.sock, F=T, T=S:10m;R:10m;E:10m') |
| 636 |
|
| 637 |
dnl Signers: |
| 638 |
INPUT_MAIL_FILTER(`dkim-filter-s', `S=inet:4445@127.0.0.1, T=R:2m') |
| 639 |
diff -Naur amavisd-new-2.6.4/README_FILES/README.chroot amavisd-new-2.6.4.oden/README_FILES/README.chroot |
| 640 |
--- amavisd-new-2.6.4/README_FILES/README.chroot 2008-12-06 01:16:26.000000000 +0100 |
| 641 |
+++ amavisd-new-2.6.4.oden/README_FILES/README.chroot 2009-06-27 12:48:01.000000000 +0200 |
| 642 |
@@ -32,11 +32,11 @@ |
| 643 |
# before running commands below, as most of them use relative paths! |
| 644 |
# |
| 645 |
umask 0022 |
| 646 |
-mkdir /var/amavis |
| 647 |
-cd /var/amavis |
| 648 |
+mkdir /var/lib/amavis |
| 649 |
+cd /var/lib/amavis |
| 650 |
|
| 651 |
|
| 652 |
-# make directory structure within the current directory (/var/amavis) |
| 653 |
+# make directory structure within the current directory (/var/lib/amavis) |
| 654 |
mkdir -p etc dev var/run var/virusmails |
| 655 |
mkdir -p usr/bin usr/lib usr/libexec usr/share usr/share/zoneinfo |
| 656 |
mkdir -p usr/share/misc usr/share/spamassassin etc/mail/spamassassin |
| 657 |
@@ -68,13 +68,13 @@ |
| 658 |
|
| 659 |
|
| 660 |
# make a symbolic link so that chrooted processes can refer to the |
| 661 |
-# home directory as /var/amavis (same as not-chrooted), and do not have |
| 662 |
+# home directory as /var/lib/amavis (same as not-chrooted), and do not have |
| 663 |
# to handle it differently (i.e. referring to it as / ) |
| 664 |
ln -s / var/amavis |
| 665 |
# actually, the following is more general: d=`pwd`; ln -s / $d$d |
| 666 |
|
| 667 |
|
| 668 |
-# copy required binaries to /var/amavis/usr/bin |
| 669 |
+# copy required binaries to /var/lib/amavis/usr/bin |
| 670 |
for j in \ |
| 671 |
/usr/bin/file /usr/bin/ar /bin/pax /usr/bin/gzip /usr/bin/bzip2 \ |
| 672 |
/usr/local/bin/nomarch /usr/local/bin/arc \ |
| 673 |
@@ -87,7 +87,7 @@ |
| 674 |
/usr/local/bin/dccproc /usr/local/bin/pyzor |
| 675 |
do cp -p $j usr/bin/; done |
| 676 |
|
| 677 |
-# copy needed /etc files to /var/amavis/etc |
| 678 |
+# copy needed /etc files to /var/lib/amavis/etc |
| 679 |
for j in \ |
| 680 |
/etc/protocols /etc/services /etc/netconfig /etc/hosts \ |
| 681 |
/etc/group /etc/passwd /etc/resolv.conf /etc/localtime \ |
| 682 |
@@ -107,8 +107,8 @@ |
| 683 |
# copy time zones data /usr/share/zoneinfo (or perhaps /usr/lib/zoneinfo) |
| 684 |
cp -pR /usr/share/zoneinfo usr/share/ # FreeBSD |
| 685 |
|
| 686 |
-# copy shared libraries to /var/amavis/lib |
| 687 |
-# (check: ldd /var/amavis/usr/bin/* to see which ones are needed) |
| 688 |
+# copy shared libraries to /var/lib/amavis/lib |
| 689 |
+# (check: ldd /var/lib/amavis/usr/bin/* to see which ones are needed) |
| 690 |
|
| 691 |
ln -s usr/lib . |
| 692 |
ln -s usr/libexec . |
| 693 |
@@ -163,8 +163,8 @@ |
| 694 |
cp /usr/local/bin/freshclam /usr/local/sbin/clamd usr/bin/ |
| 695 |
cp /usr/local/etc/clamd.conf etc/ |
| 696 |
# Start clamd and freshclam: |
| 697 |
-# chroot -u vscan /var/amavis /usr/sbin/clamd |
| 698 |
-# chroot -u vscan /var/amavis /usr/bin/freshclam -d \ |
| 699 |
+# chroot -u vscan /var/lib/amavis /usr/sbin/clamd |
| 700 |
+# chroot -u vscan /var/lib/amavis /usr/bin/freshclam -d \ |
| 701 |
# -c 4 --log-verbose --datadir=/usr/local/share/clam \ |
| 702 |
# -l /var/log/clam-update.log |
| 703 |
|
| 704 |
@@ -189,26 +189,26 @@ |
| 705 |
chmod 666 dev/null |
| 706 |
chmod 644 dev/*random |
| 707 |
|
| 708 |
-# /etc/passwd: set home directory of user vscan to /var/amavis/home !!! |
| 709 |
+# /etc/passwd: set home directory of user vscan to /var/lib/amavis/home !!! |
| 710 |
|
| 711 |
|
| 712 |
# Daemonized virus scanners (e.g. Sophie, ClamD) may be |
| 713 |
# started in the same chroot jail, or not. E.g. |
| 714 |
-# chroot /var/amavis /usr/bin/sophie -D |
| 715 |
+# chroot /var/lib/amavis /usr/bin/sophie -D |
| 716 |
# |
| 717 |
# If you want, you may now remove /usr/local/sav and make a link instead, |
| 718 |
# to avoid having two copies of Sophos database: |
| 719 |
-# ln -s /var/amavis/usr/local/sav /usr/local/sav |
| 720 |
+# ln -s /var/lib/amavis/usr/local/sav /usr/local/sav |
| 721 |
# consider: |
| 722 |
-# ln -s /var/amavis/var/run/sophie /var/run/ # Sophie socket |
| 723 |
-# ln -s /var/amavis/var/run/sophie.pid /var/run/ |
| 724 |
+# ln -s /var/lib/amavis/var/run/sophie /var/run/ # Sophie socket |
| 725 |
+# ln -s /var/lib/amavis/var/run/sophie.pid /var/run/ |
| 726 |
|
| 727 |
# Programs may be tested individually to see if they are happy |
| 728 |
# in the chroot jail: |
| 729 |
# |
| 730 |
perl -Te 'use POSIX; $ENV{PATH}="/usr/bin"; |
| 731 |
$uid=getpwnam("vscan") or die "E1:$!"; |
| 732 |
- chroot "/var/amavis" or die "E2:$!"; chdir "/"; |
| 733 |
+ chroot "/var/lib/amavis" or die "E2:$!"; chdir "/"; |
| 734 |
POSIX::setuid($uid) or die "E3:$!"; |
| 735 |
open(STDIN,"</dev/null") or die "E4:$!"; |
| 736 |
exec qw(file /etc/amavisd.conf) or die "E5:$!"'; echo $? |
| 737 |
@@ -220,8 +220,8 @@ |
| 738 |
# exec qw(gzip -c 0.lis) or die "E6:$!"'; echo $ |
| 739 |
# ... exec qw(clamscan /etc/resolv.conf) or die "E5:$!"'; echo $? |
| 740 |
|
| 741 |
-Edit /var/amavis/etc/amavisd.conf, setting: |
| 742 |
- $MYHOME = '/var/amavis'; |
| 743 |
+Edit /var/lib/amavis/etc/amavisd.conf, setting: |
| 744 |
+ $MYHOME = '/var/lib/amavis'; |
| 745 |
$ENV{TMPDIR} = $TEMPBASE = "$MYHOME/tmp-am"; |
| 746 |
$daemon_chroot_dir = $MYHOME; |
| 747 |
$helpers_home = "$MYHOME/home"; # prefer $MYHOME clean and owned by root? |
| 748 |
@@ -233,7 +233,7 @@ |
| 749 |
Logging should preferably be directed to syslog. Configure syslogd to |
| 750 |
provide a socket in the amavis jail (option -l on FreeBSD, option -a |
| 751 |
on OpenBSD and Linux). Under FreeBSD place something like: |
| 752 |
- syslogd_flags="-l /var/amavis/var/run/log -ss" |
| 753 |
+ syslogd_flags="-l /var/lib/amavis/var/run/log -ss" |
| 754 |
into /etc/rc.conf . |
| 755 |
|
| 756 |
Because the program starts outside the chroot jail and brings-in all Perl |
| 757 |
diff -Naur amavisd-new-2.6.4/README_FILES/README.milter amavisd-new-2.6.4.oden/README_FILES/README.milter |
| 758 |
--- amavisd-new-2.6.4/README_FILES/README.milter 2006-12-04 14:58:33.000000000 +0100 |
| 759 |
+++ amavisd-new-2.6.4.oden/README_FILES/README.milter 2009-06-27 12:48:01.000000000 +0200 |
| 760 |
@@ -41,7 +41,7 @@ |
| 761 |
account, just to reduce the chance that the scanner modifies the |
| 762 |
message. If you don't do this then you'll run into permission |
| 763 |
problems. The account that you run amavis as *MUST* own the |
| 764 |
- /var/amavis directory and the quarantine directory (usually |
| 765 |
+ /var/lib/amavis directory and the quarantine directory (usually |
| 766 |
/var/virusmails). |
| 767 |
|
| 768 |
Now, create the following account for amavisd and amavis milter: |
| 769 |
@@ -94,7 +94,7 @@ |
| 770 |
pick a free port number above 1024, and change: |
| 771 |
|
| 772 |
- in file sendmail.mc in the call to the macro INPUT_MAIL_FILTER |
| 773 |
- replace: S=local:/var/amavis/amavis-milter.sock |
| 774 |
+ replace: S=local:/var/lib/amavis/amavis-milter.sock |
| 775 |
with: S=inet:port@hostname |
| 776 |
|
| 777 |
(substituting 'port' with your chosen port number, |
| 778 |
@@ -103,7 +103,7 @@ |
| 779 |
|
| 780 |
- when starting milter-amavis process, change the value of |
| 781 |
it's option -p: |
| 782 |
- replace -p local:/var/amavis/amavis-milter.sock |
| 783 |
+ replace -p local:/var/lib/amavis/amavis-milter.sock |
| 784 |
with: -p inet:port@0.0.0.0 |
| 785 |
|
| 786 |
(substituting 'port' with your chosen port number, |
| 787 |
@@ -184,7 +184,7 @@ |
| 788 |
is mandatory): |
| 789 |
|
| 790 |
INPUT_MAIL_FILTER(`milter-amavis', |
| 791 |
- `S=local:/var/amavis/amavis-milter.sock, F=T, T=S:10m;R:10m;E:10m') |
| 792 |
+ `S=local:/var/lib/amavis/amavis-milter.sock, F=T, T=S:10m;R:10m;E:10m') |
| 793 |
define(`confMILTER_MACROS_ENVFROM', |
| 794 |
confMILTER_MACROS_ENVFROM`, r, b') # supply macros b,r to helper |
| 795 |
|
| 796 |
@@ -226,7 +226,7 @@ |
| 797 |
have to be launched for every message. Examples include Sophos+Sophie, |
| 798 |
Trend+Trophie and ClamAV. |
| 799 |
|
| 800 |
- * Use separate disks/controllers for the amavis spool (/var/amavis) and |
| 801 |
+ * Use separate disks/controllers for the amavis spool (/var/lib/amavis) and |
| 802 |
the sendmail spool (/var/spool/...). |
| 803 |
|
| 804 |
* Put amavis on another system (assuming you've got a fast network). This |
| 805 |
@@ -234,7 +234,7 @@ |
| 806 |
bound. |
| 807 |
|
| 808 |
* Use memory based file systems (TMPFS in Linux and Solaris, MFS in |
| 809 |
- (Free)BSD) for the amavis spool (/var/amavis). Don't do this for the |
| 810 |
+ (Free)BSD) for the amavis spool (/var/lib/amavis). Don't do this for the |
| 811 |
quarantine directory and don't do it for the sendmail spool without |
| 812 |
reading the tuning section in the Sendmail (Bat) book (3rd edition) |
| 813 |
by O'Reilly. |
| 814 |
@@ -256,7 +256,7 @@ |
| 815 |
. /etc/sysconfig/amavis |
| 816 |
else |
| 817 |
AMAVIS_ACCOUNT=amavis |
| 818 |
- MILTER_SOCKET=/var/amavis/amavis-milter.sock |
| 819 |
+ MILTER_SOCKET=/var/lib/amavis/amavis-milter.sock |
| 820 |
MILTER_FLAGS="" # Set the options you want passed to amavis-milter |
| 821 |
fi |
| 822 |
|
| 823 |
@@ -265,7 +265,7 @@ |
| 824 |
start) |
| 825 |
# Start daemons. |
| 826 |
echo -n "Starting amavis-milter: " |
| 827 |
- rm -fr /var/amavis/amavis*.sock |
| 828 |
+ rm -fr /var/lib/amavis/amavis*.sock |
| 829 |
su - ${AMAVIS_ACCOUNT} -c /usr/sbin/amavisd |
| 830 |
sleep 5 |
| 831 |
su - ${AMAVIS_ACCOUNT} -c "/usr/sbin/amavis-milter ${MILTER_FLAGS} -p local:${MILTER_SOCKET}" |
| 832 |
@@ -280,7 +280,7 @@ |
| 833 |
stop) |
| 834 |
# Stop daemons. |
| 835 |
echo -n "Shutting down amavis-milter: " |
| 836 |
- if [ -f /var/amavis/amavisd.pid ]; then |
| 837 |
+ if [ -f /var/lib/amavis/amavisd.pid ]; then |
| 838 |
# *** PAY ATTENTION *** |
| 839 |
# pkill only seems to exist in LINUX, whereas the -m option to killall only exists in BSD. |
| 840 |
# You may have to modify the following commands depending on your system. |
Parent Directory
| 
Revision Log