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