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