From 696c62417f5123712d40a5535f229f4c43f6b3e9 Mon Sep 17 00:00:00 2001
From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Mon, 12 Sep 2016 23:19:30 +0200
Subject: [PATCH] Use onchange and add postfix/conversion_underscore.regex

---
 .../testvm/postfix/conversion_underscore.regex     |  1 +
 test-vagrant-salt/salt/testvm/postfix/init.sls     | 28 +++++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 test-vagrant-salt/salt/testvm/postfix/conversion_underscore.regex

diff --git a/test-vagrant-salt/salt/testvm/postfix/conversion_underscore.regex b/test-vagrant-salt/salt/testvm/postfix/conversion_underscore.regex
new file mode 100644
index 0000000..1be91b7
--- /dev/null
+++ b/test-vagrant-salt/salt/testvm/postfix/conversion_underscore.regex
@@ -0,0 +1 @@
+/^([^_+]*)_(.*)@((.*\.)?(m4x|polytechnique|melix)\.(org|net))$/!/@(listes|bounces)\.(m4x|polytechnique)\.org/ ${1}+${2}@${3}
diff --git a/test-vagrant-salt/salt/testvm/postfix/init.sls b/test-vagrant-salt/salt/testvm/postfix/init.sls
index ed00c75..209a1e4 100644
--- a/test-vagrant-salt/salt/testvm/postfix/init.sls
+++ b/test-vagrant-salt/salt/testvm/postfix/init.sls
@@ -27,6 +27,16 @@ postfix-daemon:
     - require :
       - pkg: postfix-pkg
 
+# Simple file copy, with jinja templates
+{% for file in 'main.cf', 'master.cf', 'conversion_underscore.regex' %}
+/etc/postfix/{{ file }}:
+  file.managed:
+    - source: salt://testvm/postfix/{{ file }}
+    - template: jinja
+    - watch_in:
+      - service: postfix-daemon
+{% endfor %}
+
 /etc/postfix/aliases:
   file.managed:
     - source: salt://testvm/postfix/aliases
@@ -35,6 +45,8 @@ postfix-daemon:
       - service: postfix-daemon
   cmd.run:
     - name: postalias /etc/aliases
+    - onchanges:
+      - file: /etc/postfix/aliases
     - require:
       - pkg: postfix-pkg
       - file: /etc/postfix/aliases
@@ -49,25 +61,13 @@ postfix-daemon:
       - service: postfix-daemon
   cmd.run:
     - name: postmap /etc/postfix/{{ file }}
+    - onchanges:
+      - file: /etc/postfix/{{ file }}
     - require:
       - pkg: postfix-pkg
       - file: /etc/postfix/{{ file }}
 {% endfor %}
 
-/etc/postfix/main.cf:
-  file.managed:
-    - source: salt://testvm/postfix/main.cf
-    - template: jinja
-    - watch_in:
-      - service: postfix-daemon
-
-/etc/postfix/master.cf:
-  file.managed:
-    - source: salt://testvm/postfix/master.cf
-    - template: jinja
-    - watch_in:
-      - service: postfix-daemon
-
 # Populate /var/spool
 {% for name in 'active', 'deferred', 'incoming' %}
 /var/spool/postfix-nosrs/{{ name }}:
-- 
2.1.4