summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile1
-rw-r--r--postfix/master.cf3
-rw-r--r--postfix/submission_header_checks2
3 files changed, 6 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile
index 7eafaf1..ec181bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ RUN apt update \
dovecot-core \
dovecot-imapd \
postfix \
+ postfix-pcre \
&& apt clean
# Install files
diff --git a/postfix/master.cf b/postfix/master.cf
index d29c474..45df2bb 100644
--- a/postfix/master.cf
+++ b/postfix/master.cf
@@ -24,10 +24,13 @@ submissions inet n - n - - smtpd
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
# -o smtpd_sender_restrictions=
-o smtpd_recipient_restrictions=permit_sasl_authenticated,reject
+ -o cleanup_service_name=cleanupips
-o milter_macro_daemon_name=ORIGINATING
#628 inet n - n - - qmqpd
pickup unix n - n 60 1 pickup
cleanup unix n - n - 0 cleanup
+cleanupips unix n - n - 0 cleanup
+ -o header_checks=pcre:/etc/postfix/submission_header_checks
qmgr unix n - n 300 1 qmgr
#qmgr unix n - n 300 1 oqmgr
tlsmgr unix - - n 1000? 1 tlsmgr
diff --git a/postfix/submission_header_checks b/postfix/submission_header_checks
new file mode 100644
index 0000000..a792ca5
--- /dev/null
+++ b/postfix/submission_header_checks
@@ -0,0 +1,2 @@
+/^Received: from [^ ]+ \([^ ]+ \[[IPv0-9a-f:.]+\]\)\s+(.* \(Postfix\) with .+)$/ REPLACE Received: $1
+/^X-Originating-IP:.*/ IGNORE