diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2003-06-11 17:46:41 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2003-06-11 17:46:41 +0000 |
| commit | f34e0edce02aa0213a2727100254bafeb936b3c2 (patch) | |
| tree | c91c658a80c6232cf1005a44c528e73ebe107b4a /postfix | |
| parent | 9445113fe86390dbb013381dc690df684e96fc66 (diff) | |
A couple of AMaViS tweaks.
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/postfix.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 22a3e10..2de9fee 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -3,7 +3,7 @@ # /etc/local-COMMON/postfix/postfix.sh # Copyright 2002-2003 Jonas Smedegaard <dr@jones.dk> # -# $Id: postfix.sh,v 1.17 2003-06-01 18:36:19 jonas Exp $ +# $Id: postfix.sh,v 1.18 2003-06-11 17:46:41 jonas Exp $ # # Auto-tweak plain installed postfix Debian package # @@ -107,10 +107,16 @@ else fi if [ -x /usr/sbin/amavisd -o -x /usr/sbin/amavisd-new ]; then - cat $confdir/master.cf | egrep -q "^smtp-amavis$sp" || \ - echo 'smtp-amavis unix - - n - 2 smtp -o smtp_data_done_timeout=1200s -o smtp_never_send_ehlo=yes -o disable_dns_lookups=yes' >> $confdir/master.cf + if [ "$pf2" ]; then + cat $confdir/master.cf | egrep -q "^smtp-amavis$sp" || \ + echo 'smtp-amavis unix - - n - 2 lmtp -o smtp_data_done_timeout=1200s -o smtp_never_send_ehlo=yes -o disable_dns_lookups=yes' >> $confdir/master.cf + $postconf -e 'max_use = 10' + else + cat $confdir/master.cf | egrep -q "^smtp-amavis$sp" || \ + echo 'smtp-amavis unix - - n - 2 smtp -o smtp_data_done_timeout=1200s -o smtp_never_send_ehlo=yes -o disable_dns_lookups=yes' >> $confdir/master.cf + fi cat $confdir/master.cf | egrep -q "^127.0.0.1:10025$sp" || \ - echo '127.0.0.1:10025 inet n - n - - smtpd -o content_filter= -o local_recipient_maps= -o smtpd_helo_restrictions= -o smtpd_client_restrictions= -o smtpd_sender_restrictions= -o smtpd_recipient_restrictions=permit_mynetworks,reject -o mynetworks=127.0.0.0/8' >> $confdir/master.cf + echo '127.0.0.1:10025 inet n - n - - smtpd -o content_filter= -o local_recipient_maps= -o relay_recipient_maps= -o smtpd_restriction_classes= -o smtpd_helo_restrictions= -o smtpd_client_restrictions= -o smtpd_sender_restrictions= -o smtpd_recipient_restrictions=permit_mynetworks,reject -o mynetworks=127.0.0.0/8 -o strict_rfc821_envelopes=yes' >> $confdir/master.cf $postconf -e 'content_filter = smtp-amavis:[127.0.0.1]:10024' fi |