Browse Source

[Postfix] Add custom_transport.pcre

andryyy 5 years ago
parent
commit
e1fdbba0f7
3 changed files with 10 additions and 3 deletions
  1. 1 0
      .gitignore
  2. 7 2
      data/Dockerfiles/postfix/postfix.sh
  3. 2 1
      data/conf/postfix/main.cf

+ 1 - 0
.gitignore

@@ -10,6 +10,7 @@ data/conf/postfix/sni.map
 data/conf/postfix/sni.map.db
 data/conf/postfix/extra.cf
 data/conf/postfix/sql
+data/conf/postfix/custom_transport.pcre
 data/conf/postfix/allow_mailcow_local.regexp
 data/conf/dovecot/sql
 data/conf/nextcloud-*.bak

+ 7 - 2
data/Dockerfiles/postfix/postfix.sh

@@ -313,9 +313,14 @@ if [ -f /opt/postfix/conf/extra.cf ]; then
   cat /opt/postfix/conf/extra.cf >> /opt/postfix/conf/main.cf
 fi
 
+if [ ! -f /opt/postfix/conf/custom_transport.pcre ]; then
+  echo "Creating dummy custom_transport.pcre"
+  touch /opt/postfix/conf/custom_transport.pcre
+fi
+
 # Fix Postfix permissions
-chown -R root:postfix /opt/postfix/conf/sql/
-chmod 640 /opt/postfix/conf/sql/*.cf
+chown -R root:postfix /opt/postfix/conf/sql/ /opt/postfix/conf/custom_transport.pcre
+chmod 640 /opt/postfix/conf/sql/*.cf /opt/postfix/conf/custom_transport.pcre
 chgrp -R postdrop /var/spool/postfix/public
 chgrp -R postdrop /var/spool/postfix/maildrop
 postfix set-permissions

+ 2 - 1
data/conf/postfix/main.cf

@@ -181,7 +181,8 @@ smtp_tls_policy_maps=proxy:mysql:/opt/postfix/conf/sql/mysql_tls_policy_override
 smtp_header_checks = pcre:/opt/postfix/conf/anonymize_headers.pcre
 mail_name = Postcow
 # local_transport map catches local destinations and prevents routing local dests when the next map would route "*"
-transport_maps = pcre:/opt/postfix/conf/local_transport,
+transport_maps = pcre:/opt/postfix/conf/custom_transport.pcre,
+  pcre:/opt/postfix/conf/local_transport,
   proxy:mysql:/opt/postfix/conf/sql/mysql_transport_maps.cf
 smtp_sasl_auth_soft_bounce = no
 postscreen_discard_ehlo_keywords = silent-discard, dsn