summaryrefslogtreecommitdiff
path: root/postfix
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-05-25 16:44:56 +0000
committerJonas Smedegaard <dr@jones.dk>2008-05-25 16:44:56 +0000
commit4c0807e485585770792cff5764e6dc47012453c9 (patch)
tree69edae084cdff4ac537552c5a5403af1dd0b5b08 /postfix
parent7f7086e0679639396dd1660d57602a03e51dc680 (diff)
Add dkimsign service (and commented out use of dkim_filter).
Diffstat (limited to 'postfix')
-rwxr-xr-xpostfix/postfix.sh24
1 files changed, 23 insertions, 1 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh
index 05dc277..e183e29 100755
--- a/postfix/postfix.sh
+++ b/postfix/postfix.sh
@@ -3,7 +3,7 @@
# /etc/local-COMMON/postfix/postfix.sh
# Copyright 2002-2007 Jonas Smedegaard <dr@jones.dk>
#
-# $Id: postfix.sh,v 1.69 2008-05-25 16:15:01 jonas Exp $
+# $Id: postfix.sh,v 1.70 2008-05-25 16:44:56 jonas Exp $
#
# Auto-tweak plain installed postfix Debian package
#
@@ -287,6 +287,28 @@ EOF
EOF
if [ -n "$dkimproxy" ]; then
$postconf -c "$tempdir" -e 'content_filter = smtp-amavis:[127.0.0.1]:10028'
+# FIXME: needs multiline replacementroutine (using perl?)
+# cat $tempdir/master.cf | egrep -q "^submission$sp" || \
+# cat >> $tempdir/master.cf << EOF
+#submission inet n - n - - smtpd
+# -o smtpd_etrn_restrictions=reject
+# -o smtpd_enforce_tls=yes
+# -o smtpd_sasl_auth_enable=yes
+# -o content_filter=dkimsign:[127.0.0.1]:10028
+# -o receive_override_options=no_address_mappings
+# -o smtpd_recipient_restrictions=permit_mynetworks,permit_sasl_authenticated,reject
+#EOF
+# cat $tempdir/master.cf | egrep -q "^pickup$sp" || \
+# cat >> $tempdir/master.cf << EOF
+#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
+ -o smtp_send_xforward_command=yes
+ -o smtp_discard_ehlo_keywords=8bitmime
+EOF
else
$postconf -c "$tempdir" -e 'content_filter = smtp-amavis:[127.0.0.1]:10024'
fi