diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2012-09-09 16:15:47 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2012-09-09 17:43:59 +0200 |
| commit | b3d471b94029499a7df2c7e6909b17e9d1d2d54c (patch) | |
| tree | cf8d7c6c6aaaf1ca2176814306eb949eed63be58 /postfix | |
| parent | 3ac37e87df15bfe46973ec6240e7866e285f5e21 (diff) | |
Tidy use of tabs for master.cf.
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/postfix.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 34ba2b5..0132451 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -271,7 +271,7 @@ if [ -n "$sasl_cyrus" ]; then -e "s/^#\(tlsmgr$sp\)/\1/" \ "$tempdir/master.cf" cat $tempdir/master.cf | egrep -q "^tlsmgr$sp" || \ - echo 'tlsmgr unix - - - 300 1 tlsmgr' >> $tempdir/master.cf + echo 'tlsmgr unix - - - 300 1 tlsmgr' >> $tempdir/master.cf fi case "$sasl_main_type" in '') ;; @@ -362,7 +362,7 @@ EOF # FIXME: needs multiline replacementroutine (using perl?) # cat $tempdir/master.cf | egrep -q "^submission$sp" || \ # cat >> $tempdir/master.cf << EOF -#submission inet n - n - - smtpd +#submission inet n - n - - smtpd # -o smtpd_etrn_restrictions=reject # -o smtpd_enforce_tls=yes # -o smtpd_sasl_auth_enable=yes @@ -372,18 +372,18 @@ EOF #EOF # cat $tempdir/master.cf | egrep -q "^pickup$sp" || \ # cat >> $tempdir/master.cf << EOF -#pickup fifo n - - 60 1 pickup +#pickup fifo n - - 60 1 pickup # -o content_filter=dkimsign:127.0.0.1:10028 #EOF cat $tempdir/master.cf | egrep -q "^dkimsign$sp" || \ cat >> $tempdir/master.cf << EOF -dkimsign unix - - n - 10 smtp +dkimsign unix - - n - 10 smtp -o smtp_send_xforward_command=yes -o smtp_discard_ehlo_keywords=8bitmime EOF cat $tempdir/master.cf | egrep -q "^127\.0\.0\.1:10029$sp" || \ cat >> $tempdir/master.cf << EOF -127.0.0.1:10029 inet n - n - 10 smtpd +127.0.0.1:10029 inet n - n - 10 smtpd -o content_filter= -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks -o smtpd_helo_restrictions= |