From ca9aea8a80998217ecb19bc9a0ec08d9978ad8ee Mon Sep 17 00:00:00 2001
From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Mon, 12 Sep 2016 22:08:05 +0200
Subject: [PATCH] Add /etc/postfix/header_checks/

---
 test-vagrant-salt/salt/testvm/postfix/header_checks/init.sls | 6 ++++++
 test-vagrant-salt/salt/testvm/postfix/header_checks/mime     | 1 +
 test-vagrant-salt/salt/testvm/postfix/header_checks/outgoing | 2 ++
 test-vagrant-salt/salt/testvm/postfix/header_checks/testvm   | 1 +
 test-vagrant-salt/salt/testvm/postfix/init.sls               | 3 +++
 test-vagrant-salt/salt/testvm/postfix/main.cf                | 4 +---
 6 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 test-vagrant-salt/salt/testvm/postfix/header_checks/init.sls
 create mode 100644 test-vagrant-salt/salt/testvm/postfix/header_checks/mime
 create mode 100644 test-vagrant-salt/salt/testvm/postfix/header_checks/outgoing
 create mode 100644 test-vagrant-salt/salt/testvm/postfix/header_checks/testvm

diff --git a/test-vagrant-salt/salt/testvm/postfix/header_checks/init.sls b/test-vagrant-salt/salt/testvm/postfix/header_checks/init.sls
new file mode 100644
index 0000000..e40fc66
--- /dev/null
+++ b/test-vagrant-salt/salt/testvm/postfix/header_checks/init.sls
@@ -0,0 +1,6 @@
+{% for file in 'mime', 'outgoing', 'testvm' %}
+/etc/postfix/header_checks/{{ file }}:
+  file.managed:
+    - source: salt://testvm/postfix/header_checks/{{ file }}
+    - makedirs: True
+{% endfor %}
diff --git a/test-vagrant-salt/salt/testvm/postfix/header_checks/mime b/test-vagrant-salt/salt/testvm/postfix/header_checks/mime
new file mode 100644
index 0000000..11c2893
--- /dev/null
+++ b/test-vagrant-salt/salt/testvm/postfix/header_checks/mime
@@ -0,0 +1 @@
+/^\s*Content-Type:.*message\/(partial|external-body)/ REJECT This kind of attachements (message/$1) is rejected.
diff --git a/test-vagrant-salt/salt/testvm/postfix/header_checks/outgoing b/test-vagrant-salt/salt/testvm/postfix/header_checks/outgoing
new file mode 100644
index 0000000..bd71fdc
--- /dev/null
+++ b/test-vagrant-salt/salt/testvm/postfix/header_checks/outgoing
@@ -0,0 +1,2 @@
+# Outgoing filter rules
+/^To: .*testvm.example.com/ HOLD
diff --git a/test-vagrant-salt/salt/testvm/postfix/header_checks/testvm b/test-vagrant-salt/salt/testvm/postfix/header_checks/testvm
new file mode 100644
index 0000000..ab55313
--- /dev/null
+++ b/test-vagrant-salt/salt/testvm/postfix/header_checks/testvm
@@ -0,0 +1 @@
+/^To: .*@bounces.m4x.org/ DISCARD "Bad or no SRS mail to @bounces.m4x.org"
diff --git a/test-vagrant-salt/salt/testvm/postfix/init.sls b/test-vagrant-salt/salt/testvm/postfix/init.sls
index 54954de..f2211ce 100644
--- a/test-vagrant-salt/salt/testvm/postfix/init.sls
+++ b/test-vagrant-salt/salt/testvm/postfix/init.sls
@@ -1,3 +1,6 @@
+include:
+  - .header_checks
+
 no-other-mta:
   pkg.removed:
     - pkg: exim4
diff --git a/test-vagrant-salt/salt/testvm/postfix/main.cf b/test-vagrant-salt/salt/testvm/postfix/main.cf
index e969ae6..0e8c090 100644
--- a/test-vagrant-salt/salt/testvm/postfix/main.cf
+++ b/test-vagrant-salt/salt/testvm/postfix/main.cf
@@ -204,9 +204,7 @@ strict_rfc821_envelopes = yes
 nested_header_checks    =
 mime_header_checks      = regexp:/etc/postfix/header_checks/mime
 header_checks           =
-    regexp:/etc/postfix/header_checks/xorg
-    regexp:/etc/postfix/header_checks/antispam
-    regexp:/etc/postfix/header_checks/clean_self
+    regexp:/etc/postfix/header_checks/testvm
 
 smtp_header_checks      = regexp:/etc/postfix/header_checks/outgoing
 
-- 
2.1.4