projects / packages / amavisd-new.git / blame
| Commit | Line | Data |
|---|---|---|
| eda82b86 JR |
1 | diff -ur amavisd-new-20021227.orig/amavisd amavisd-new-20021227/amavisd |
| 2 | --- amavisd-new-20021227.orig/amavisd Mon Dec 30 17:36:10 2002 | |
| 3 | +++ amavisd-new-20021227/amavisd Tue Jan 7 18:00:57 2003 | |
| 4 | @@ -214,7 +214,7 @@ | |
| 5 | # | |
| 6 | # Receiving mail related | |
| 7 | ||
| 8 | -# $unix_socketname = '/var/amavis/amavisd.sock'; # traditional amavis client protocol | |
| 9 | +# $unix_socketname = '/var/spool/amavis/runtime/amavisd.sock'; # traditional amavis client protocol | |
| 10 | # $inet_socket_port = 10024; # accept SMTP on this TCP port | |
| 11 | $inet_socket_bind = '127.0.0.1'; # limit socket bind to loopback interface | |
| 12 | ||
| 13 | @@ -223,7 +223,7 @@ | |
| 14 | $gets_addr_in_quoted_form = 0; | |
| 15 | ||
| 16 | # Temporary directory | |
| 17 | -$TEMPBASE = "/var/amavis"; | |
| 18 | +$TEMPBASE = "/var/spool/amavis/runtime"; | |
| 19 | ||
| 20 | $notify_method = 'smtp:127.0.0.1:10025'; | |
| 21 | $forward_method = 'smtp:127.0.0.1:10025'; | |
| 22 | diff -ur amavisd-new-20021227.orig/amavisd.conf amavisd-new-20021227/amavisd.conf | |
| 23 | --- amavisd-new-20021227.orig/amavisd.conf Fri Dec 27 16:04:17 2002 | |
| 24 | +++ amavisd-new-20021227/amavisd.conf Tue Jan 7 18:00:02 2003 | |
| 25 | @@ -40,7 +40,7 @@ | |
| 26 | $daemon_group = 'amavis'; # (no default) | |
| 27 | ||
| 28 | # Runtime directory (no trailing slash, defaults to '/var/amavis') | |
| 29 | -$TEMPBASE = '/var/amavis'; | |
| 30 | +$TEMPBASE = '/var/spool/amavis/runtime'; | |
| 31 | ||
| 32 | ||
| 33 | # MTA SETTINGS, UNCOMMENT AS APPROPRIATE, defaults to 'smtp:127.0.0.1:10025' | |
| 34 | @@ -59,7 +59,7 @@ | |
| 35 | #$notify_method = 'pipe:flags=q argv=/usr/sbin/sendmail -i -f ${sender} -- ${recipient}'; | |
| 36 | ||
| 37 | ||
| 38 | -#$daemon_chroot_dir = '/var/amavis'; # (default is undef => do not chroot) | |
| 39 | +#$daemon_chroot_dir = '/var/spool/amavis'; # (default is undef => do not chroot) | |
| 66ce8ece | 40 | |
| eda82b86 JR |
41 | #$pid_file = "$TEMPBASE/amavisd.pid"; # (default: "$TEMPBASE/amavisd.pid") |
| 42 | #$lock_file = "$TEMPBASE/amavisd.lock"; # (default: "$TEMPBASE/amavisd.lock") | |
| 43 | @@ -221,12 +221,12 @@ | |
| 44 | # assigning new text to template variables, or by reading template text | |
| 45 | # from files: | |
| 66ce8ece | 46 | # |
| eda82b86 JR |
47 | -# $notify_sender_templ = read_text('/var/amavis/notify_sender.txt'); |
| 48 | -# $notify_virus_sender_templ= read_text('/var/amavis/notify_virus_sender.txt'); | |
| 49 | -# $notify_virus_admin_templ = read_text('/var/amavis/notify_virus_admin.txt'); | |
| 50 | -# $notify_virus_recips_templ= read_text('/var/amavis/notify_virus_recips.txt'); | |
| 51 | -# $notify_spam_sender_templ = read_text('/var/amavis/notify_spam_sender.txt'); | |
| 52 | -# $notify_spam_admin_templ = read_text('/var/amavis/notify_spam_admin.txt'); | |
| 53 | +# $notify_sender_templ = read_text('/var/spool/amavis/notify_sender.txt'); | |
| 54 | +# $notify_virus_sender_templ= read_text('/var/spool/amavis/notify_virus_sender.txt'); | |
| 55 | +# $notify_virus_admin_templ = read_text('/var/spool/amavis/notify_virus_admin.txt'); | |
| 56 | +# $notify_virus_recips_templ= read_text('/var/spool/amavis/notify_virus_recips.txt'); | |
| 57 | +# $notify_spam_sender_templ = read_text('/var/spool/amavis/notify_spam_sender.txt'); | |
| 58 | +# $notify_spam_admin_templ = read_text('/var/spool/amavis/notify_spam_admin.txt'); | |
| 59 | ||
| 60 | # Treat envelope sender address as unreliable and don't send | |
| 61 | # sender notification if name(s) of detected virus(es) match the list. | |
| 62 | @@ -255,9 +255,9 @@ | |
| 63 | # for compatibility, which in turn defaults to undef (empty) ) | |
| 64 | # | |
| 65 | $mailfrom_notify_sender = ''; # null reserse path. Should not be changed! | |
| 66 | -$mailfrom_notify_admin = 'virusalert@example.com'; | |
| 67 | -$mailfrom_notify_recip = 'virusalert@example.com'; | |
| 68 | -$mailfrom_notify_spamadmin = 'spam.police@example.com'; | |
| 69 | +$mailfrom_notify_admin = 'virusalert@localhost'; | |
| 70 | +$mailfrom_notify_recip = 'virusalert@localhost'; | |
| 71 | +$mailfrom_notify_spamadmin = 'spam.police@localhost'; | |
| 72 | ||
| 73 | # 'From' HEADER FIELD for sender and admin notifications. | |
| 74 | # This should be a replyable address, see rfc1894. Not to be confused | |
| 75 | @@ -285,7 +285,7 @@ | |
| 76 | ||
| 77 | # $virus_admin = undef; # do not send virus admin notifications (default) | |
| 78 | # $virus_admin = {'not.example.com' => '', '.' => 'virusalert@example.com'}; | |
| 79 | -$virus_admin = 'virus-admin@example.com'; | |
| 80 | +$virus_admin = 'virus-admin@localhost'; | |
| 81 | ||
| 82 | # equivalent to $virus_admin, but for spam admin notifications: | |
| 83 | # $spam_admin = undef; # do not send spam admin notifications (default) | |
| 84 | @@ -309,7 +309,7 @@ | |
| 85 | # or a directory (no trailing slash) | |
| 86 | # (the default value is undef, meaning no quarantine) | |
| 66ce8ece | 87 | # |
| eda82b86 JR |
88 | -$QUARANTINEDIR = '/var/virusmails'; |
| 89 | +$QUARANTINEDIR = '/var/spool/amavis/virusmails'; | |
| 90 | ||
| 91 | ||
| 92 | # A finer control of quarantining is available through variable | |
| 93 | @@ -638,7 +638,7 @@ | |
| 94 | # a hash lookup table can be read from a file, | |
| 95 | # one address per line, comments and empty lines are permitted: | |
| 96 | # | |
| 97 | -read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender'); | |
| 98 | +read_hash(\%whitelist_sender, '/var/spool/amavis/whitelist_sender'); | |
| 99 | ||
| 100 | # ... or set directly: | |
| 101 | map { $whitelist_sender{lc($_)}=1 } (qw( | |
| 102 | Only in amavisd-new-20021227: amavisd~ |