# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1533462051 -3600
# Node ID 83885499c09382dac98f1bb89ea53a645789f093
# Parent  89cd717361fda029493d93b8538a06fd4f21a801
Strip some headers on outbound emails

Necessary because GMail app on Android using an account on our
server adds half of the MS Outlook headers, but not the others
and this causes SpamAssassin to flag as spam

diff -r 89cd717361fd -r 83885499c093 modules/postfix/manifests/init.pp
--- a/modules/postfix/manifests/init.pp	Thu May 24 20:38:26 2018 +0100
+++ b/modules/postfix/manifests/init.pp	Sun Aug 05 10:40:51 2018 +0100
@@ -68,10 +68,14 @@
   file { '/etc/postfix/header_checks':
     source => 'puppet:///private/postfix/header_checks',
   }
-  #Bad headers (use even more sparingly!)
+  #Bad body (use even more sparingly!)
   file { '/etc/postfix/body_checks':
     source => 'puppet:///private/postfix/body_checks',
   }
+  # Outbound header manipulation
+  file { '/etc/postfix/smtp_header_checks':
+    source => 'puppet:///private/postfix/smtp_header_checks',
+  }
   #Whitelisted HELO names
   file { '/etc/postfix/helo_whitelist':
     source => 'puppet:///private/postfix/helo_whitelist',
diff -r 89cd717361fd -r 83885499c093 modules/postfix/templates/main.cf.erb
--- a/modules/postfix/templates/main.cf.erb	Thu May 24 20:38:26 2018 +0100
+++ b/modules/postfix/templates/main.cf.erb	Sun Aug 05 10:40:51 2018 +0100
@@ -67,6 +67,7 @@
 message_size_limit = 15000000
 header_checks = regexp:/etc/postfix/header_checks
 body_checks  = regexp:/etc/postfix/body_checks
+smtp_header_checks = regexp:/etc/postfix/smtp_header_checks
 
 # The following may not be used by all versions of Postfix
 postscreen_dnsbl_threshold = 2