Merge pull request saltstack-formulas#43 from EvaSDK/generic-map-handling

Generic map handling

Author: aboe76

pillar.example

@@ -5,22 +5,6 @@ postfix:
 
   enable_service: True
 
-  virtual:
-    groupaliasexample: 
-     - [email protected]
-     - [email protected]
-    singlealiasexample: '[email protected]'
-
-  relay_domains:
-    example.com: 'OK'
-
-  sasl_passwd:
-    smtp.example.com: 'somepassword'
-
-  sender_canonical:
-    root: '[email protected]'
-    nagios: '[email protected]'
-
   postgrey:
     enabled: True
     enable_service: True
@@ -62,6 +46,14 @@ postfix:
     smtp_tls_cert_file: /etc/postfix/ssl/example.com-relay-client-cert.crt
     smtp_tls_key_file: /etc/postfix/ssl/example.com-relay-client-cert.key
 
+    smtp_sasl_password_maps: hash:/etc/postfix/sasl_passwd
+
+    sender_canonical_maps: hash:/etc/postfix/sender_canonical
+
+    relay_recipient_maps: hash:/etc/postfix/relay_domains
+
+    virtual_alias_maps: hash:/etc/postfix/virtual
+
   certificates:
     server-cert:
       public_cert: |
@@ -88,3 +80,20 @@ postfix:
         -----BEGIN RSA PRIVATE KEY-----
         (Your Private key)
         -----END RSA PRIVATE KEY-----
+
+  mapping:
+    smtp_sasl_password_maps:
+      - smtp.example.com: myaccount:somepassword
+
+    sender_canonical_maps:
+      - root: [email protected]
+      - nagios: [email protected]
+
+    relay_recipient_maps:
+      - example.com: OK
+
+    virtual_alias_maps:
+      - groupaliasexample:
+        - [email protected]
+        - [email protected]
+      - singlealiasexample: [email protected]

postfix/files/mapping.j2

@@ -0,0 +1,21 @@
+# Managed by config management
+
+{%- macro format_value(key, value) %}
+  {#- Some settings, like virtual_alias_maps can take multiple values. Handle this case. -#}
+  {%- if value is iterable and value is not string -%}
+{{ key }}	{{ value|join(", ") }}
+  {%- else -%}
+{{ key }}	{{ value }}
+  {%- endif -%}
+{%- endmacro %}
+
+{%- if data is mapping %}
+{% for key, value in data.iteritems() %}
+{{ format_value(key, value) }}
+{%- endfor -%}
+{%- else %}
+{#- Some settings need order, handle OrderedDict #}
+{% for item in data %}
+{{ format_value(item.keys()[0], item.values()[0]) }}
+{%- endfor -%}
+{%- endif %}

postfix/init.sls

@@ -12,25 +12,6 @@ postfix:
     - watch:
       - pkg: postfix
 
-{%- macro postmap_file(filename, mode=644) %}
-{%- set file_path = '/etc/postfix/' ~ filename %}
-postmap_{{ filename }}:
-  file.managed:
-    - name: {{ file_path }}
-    - source: salt://postfix/{{ filename }}
-    - user: root
-    - group: root
-    - mode: {{ mode }}
-    - template: jinja
-    - require:
-      - pkg: postfix
-  cmd.wait:
-    - name: /usr/sbin/postmap {{ file_path }}
-    - cwd: /
-    - watch:
-      - file: {{ file_path }}
-{%- endmacro %}
-
 # manage /etc/aliases if data found in pillar
 {% if 'aliases' in pillar.get('postfix', '') %}
 {{ postfix.aliases_file }}:
@@ -51,22 +32,37 @@ run-newaliases:
       - file: {{ postfix.aliases_file }}
 {% endif %}
 
-# manage /etc/postfix/virtual if data found in pillar
-{% if 'virtual' in pillar.get('postfix', '') %}
-{{ postmap_file('virtual') }}
-{% endif %}
-
-# manage /etc/postfix/relay_domains if data found in pillar
-{% if 'relay_domains' in pillar.get('postfix', '') %}
-{{ postmap_file('relay_domains') }}
-{% endif %}
-
-# manage /etc/postfix/sasl_passwd if data found in pillar
-{% if 'sasl_passwd' in pillar.get('postfix', '') %}
-{{ postmap_file('sasl_passwd', 600) }}
-{% endif %}
-
-# manage /etc/postfix/sender_canonical if data found in pillar
-{% if 'sender_canonical' in pillar.get('postfix', '') %}
-{{ postmap_file('sender_canonical') }}
-{% endif %}
+# manage various mappings
+{% for mapping, data in salt['pillar.get']('postfix:mapping', {}).items() %}
+  {%- set need_postmap = False %}
+  {%- set file_path = salt['pillar.get']('postfix:config:' ~ mapping) %}
+  {%- if ':' in file_path %}
+    {%- set file_path = file_path.split(':')[1] %}
+    {%- set need_postmap = True %}
+  {%- endif %}
+postfix_{{ mapping }}:
+  file.managed:
+    - name: {{ file_path }}
+    - source: salt://postfix/files/mapping.j2
+    - user: root
+    - group: root
+    {%- if mapping.endswith('_sasl_password_maps') %}
+    - mode: 600
+    {%- else %}
+    - mode: 644
+    {%- endif %}
+    - template: jinja
+    - context:
+        data: {{ data|json() }}
+    - require:
+      - pkg: postfix
+  {%- if need_postmap %}
+  cmd.wait:
+    - name: /usr/sbin/postmap {{ file_path }}
+    - cwd: /
+    - watch:
+      - file: {{ file_path }}
+    - watch_in:
+      - service: postfix
+  {%- endif %}
+{% endfor %}