summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot@culturestrings <root@culturestrings>2020-08-29 00:38:33 +0000
committerroot@culturestrings <root@culturestrings>2020-08-29 00:38:33 +0000
commit870125b28b0b728890c8da1db42d48b89ba60ce6 (patch)
tree111db38af90cbd4db11cbb5d27675261b7309ee6
parent319898b7f6496aeaf38b14f7b3a54147a3dfb75c (diff)
downloadculturestrings-870125b28b0b728890c8da1db42d48b89ba60ce6.tar.bz2
culturestrings-870125b28b0b728890c8da1db42d48b89ba60ce6.tar.xz
postfix: submission port (client certs required): opendkim integration.
-rwxr-xr-xpublic/fs/etc/postfix/header_checks_submission-in.sh13
-rw-r--r--public/fs/etc/postfix/header_checks_submission.in1
-rw-r--r--public/fs/etc/postfix/master.cf7
3 files changed, 21 insertions, 0 deletions
diff --git a/public/fs/etc/postfix/header_checks_submission-in.sh b/public/fs/etc/postfix/header_checks_submission-in.sh
new file mode 100755
index 0000000..1eb82bb
--- /dev/null
+++ b/public/fs/etc/postfix/header_checks_submission-in.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -eu
+
+sitezone="$1"
+
+cfg_script="$0"
+cfg_srcdir=$(cd -- "${cfg_script%/*}/" ; pwd -P)
+
+source /root/config/private/config/hostinfo/${sitezone}
+
+sed -e 's/@mailhost@/'"${mailhost}"'/g' \
+ "${cfg_srcdir}/header_checks_submission.in"
diff --git a/public/fs/etc/postfix/header_checks_submission.in b/public/fs/etc/postfix/header_checks_submission.in
new file mode 100644
index 0000000..0d16987
--- /dev/null
+++ b/public/fs/etc/postfix/header_checks_submission.in
@@ -0,0 +1 @@
+/^Received: from (.*) \((.*) \[(.*)\]\)(.*)/ REPLACE Received: from 127.0.0.1 (@mailhost@ [127.0.0.1])$4
diff --git a/public/fs/etc/postfix/master.cf b/public/fs/etc/postfix/master.cf
index 3029630..db25f9d 100644
--- a/public/fs/etc/postfix/master.cf
+++ b/public/fs/etc/postfix/master.cf
@@ -8,6 +8,10 @@ submission inet n - n - - smtpd
-o smtpd_tls_security_level=encrypt
-o smtpd_tls_req_ccert=yes
-o smtpd_tls_auth_only=yes
+ -o smtpd_milters=unix:/var/spool/postfix/opendkim/submission.sock
+ -o non_smtpd_milters=unix:/var/spool/postfix/opendkim/submission.sock
+ -o milter_default_action=reject
+ -o cleanup_service_name=ascleanup
smtp inet n - n - - smtpd
smtp unix - - n - - smtp
@@ -47,3 +51,6 @@ virtual unix - n n - - virtual
lmtp unix - - n - - lmtp
anvil unix - - n - 1 anvil
scache unix - - n - 1 scache
+
+ascleanup unix n - y - 0 cleanup
+ -o header_checks=pcre:/etc/postfix/header_checks_submission