1 diff -ur amavisd-new-20030314.orig/amavisd amavisd-new-20030314/amavisd
2 --- amavisd-new-20030314.orig/amavisd Sat Mar 22 01:52:53 2003
3 +++ amavisd-new-20030314/amavisd Tue May 6 14:49:15 2003
5 $unicode_aware = $]>=5.008 && length("\x{263a}")==1 && eval { require Encode };
7 # serves only as a quick default for other configuration settings
8 -$MYHOME = '/var/amavis';
9 +$MYHOME = '/var/spool/amavis/runtime';
10 $mydomain = '!change-mydomain-variable!.example.com';# purposely broken default
12 # Create debugging output - yes: log to stderr; no: log to syslog/file
13 diff -ur amavisd-new-20030314.orig/amavisd.conf amavisd-new-20030314/amavisd.conf
14 --- amavisd-new-20030314.orig/amavisd.conf Fri Mar 21 18:19:23 2003
15 +++ amavisd-new-20030314/amavisd.conf Tue May 6 14:53:29 2003
17 # $MYHOME serves as a quick default for some other configuration settings.
18 # More refined control is available with each individual setting further down.
19 # $MYHOME is never used directly by the program. No trailing slash!
20 -#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis')
21 +#$MYHOME = '/var/spool/amavis/runtime'; # (default is '/var/amavis')
23 # $mydomain serves as a quick default for some other configuration settings.
24 # More refined control is available with each individual setting further down.
25 # $mydomain is never used directly by the program.
26 -$mydomain = 'example.com'; # (no useful default)
27 +$mydomain = 'localhost'; # (no useful default)
29 # Set the user and group to which the daemon will change if started as root
30 # (otherwise just keep the UID unchanged, and these settings have no effect):
31 -$daemon_user = 'vscan'; # (no default; customary: vscan or amavis)
32 -$daemon_group = 'sweep'; # (no default; customary: vscan or amavis)
33 +$daemon_user = 'amavis'; # (no default; customary: vscan or amavis)
34 +$daemon_group = 'amavis'; # (no default; customary: vscan or amavis)
36 # Runtime working directory (cwd), and a place where
37 # temporary directories for unpacking mail are created.
39 # directly, or read from a file, one domain per line; comments and empty lines
40 # are ignored, a dot before a domain name implies its subdomains:
42 -#read_hash(\%local_domains, '/var/amavis/local_domains');
43 +#read_hash(\%local_domains, '/var/spool/amavis/local_domains');
45 #or alternatively(B), using a list of regular expressions:
46 # $local_domains_re = new_RE( qr'[@.]example\.com$'i );
48 # or later; second argument is ignored otherwise. See PerlIO::encoding,
49 # Encode::PerlIO and perluniintro man pages.
51 -# $notify_sender_templ = read_text('/var/amavis/notify_sender.txt');
52 -# $notify_virus_sender_templ= read_text('/var/amavis/notify_virus_sender.txt');
53 -# $notify_virus_admin_templ = read_text('/var/amavis/notify_virus_admin.txt');
54 -# $notify_virus_recips_templ= read_text('/var/amavis/notify_virus_recips.txt');
55 -# $notify_spam_sender_templ = read_text('/var/amavis/notify_spam_sender.txt');
56 -# $notify_spam_admin_templ = read_text('/var/amavis/notify_spam_admin.txt');
57 +# $notify_sender_templ = read_text('/var/spool/amavis/notify_sender.txt');
58 +# $notify_virus_sender_templ= read_text('/var/spool/amavis/notify_virus_sender.txt');
59 +# $notify_virus_admin_templ = read_text('/var/spool/amavis/notify_virus_admin.txt');
60 +# $notify_virus_recips_templ= read_text('/var/spool/amavis/notify_virus_recips.txt');
61 +# $notify_spam_sender_templ = read_text('/var/spool/amavis/notify_spam_sender.txt');
62 +# $notify_spam_admin_templ = read_text('/var/spool/amavis/notify_spam_admin.txt');
65 # Here is an overall picture (sequence of events) of how pieces fit together
67 # or a directory (no trailing slash)
68 # (the default value is undef, meaning no quarantine)
70 -$QUARANTINEDIR = '/var/virusmails';
71 +$QUARANTINEDIR = '/var/spool/amavis/virusmails';
73 #$virus_quarantine_method = "local:virus-%i-%n"; # default
74 #$spam_quarantine_method = "local:spam-%b-%i-%n"; # default
76 # a hash lookup table can be read from a file,
77 # one address per line, comments and empty lines are permitted:
79 -# read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
80 +# read_hash(\%whitelist_sender, '/var/spool/amavis/whitelist_sender');
82 # ... or set directly:
83 map { $whitelist_sender{lc($_)}=1 } (qw(
84 Only in amavisd-new-20030314: amavisd.conf.orig
85 Only in amavisd-new-20030314: amavisd.conf.rej
86 Only in amavisd-new-20030314: amavisd.conf~