# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1452942069 0
# Node ID 4412f5e0b2bae6e486d8e4d6082be6658cf17d29
# Parent  61a79ae833cb022334a44af91d44c42e2d23171c
Add body checks to emails for the minority of obvious spam that aren't caught

diff -r 61a79ae833cb -r 4412f5e0b2ba modules/postfix/manifests/init.pp
--- a/modules/postfix/manifests/init.pp	Sat Jan 16 11:00:38 2016 +0000
+++ b/modules/postfix/manifests/init.pp	Sat Jan 16 11:01:09 2016 +0000
@@ -67,6 +67,10 @@
   file { '/etc/postfix/header_checks':
     source => 'puppet:///private/postfix/header_checks',
   }
+  #Bad headers (use even more sparingly!)
+  file { '/etc/postfix/body_checks':
+    source => 'puppet:///private/postfix/body_checks',
+  }
   #Whitelisted HELO names
   file { '/etc/postfix/helo_whitelist':
     source => 'puppet:///private/postfix/helo_whitelist',
diff -r 61a79ae833cb -r 4412f5e0b2ba modules/postfix/templates/main.cf.erb
--- a/modules/postfix/templates/main.cf.erb	Sat Jan 16 11:00:38 2016 +0000
+++ b/modules/postfix/templates/main.cf.erb	Sat Jan 16 11:01:09 2016 +0000
@@ -65,6 +65,7 @@
 transport_maps = hash:/etc/postfix/transport
 message_size_limit = 15000000
 header_checks = regexp:/etc/postfix/header_checks
+body_checks  = regexp:/etc/postfix/body_checks
 
 # The following may not be used by all versions of Postfix
 postscreen_dnsbl_threshold = 2