updated postfix state

2020-07-19 14:45:46 +02:00 · 2020-07-19 14:45:46 +02:00 · 3f63069424
commit 3f63069424
parent e75d6efbf9
3 changed files with 9 additions and 5 deletions
--- a/states/postfix/config.sls
+++ b/states/postfix/config.sls
@ -28,18 +28,18 @@ postfix-master-cf:
    - watch_in:
      - service: postfix-service

-{%- for key, value in postfix.config.pgsql.items() %}
+{%- for key, value in postfix.config.pgsql.files.items() %}
 postfix-pgsql-{{ key }}:
  file.managed:
    - name: {{ postfix.base_dir }}/pgsql/{{ key }}.cf
-    - source: salt://postfix/templates/plain.cf.j2
+    - source: salt://postfix/templates/pgsql.cf.j2
    - user: root
    - group: root
    - mode: 644
    - template: jinja
    - context:
-      value: |
-        {{ value|indent(8) }}
+      config: {{ postfix.config.pgsql.config }}
+      query: {{ value.query }}
    - watch_in:
      - service: postfix-service
 {% endfor %}
--- a/states/postfix/templates/pgsql.cf.j2
+++ b/states/postfix/templates/pgsql.cf.j2
@ -0,0 +1,5 @@
+## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
+{% for k, v in config.items() -%}
+{{ k }} = {{ v }}
+{% endfor -%}
+query = {{ query }}
--- a/states/postfix/templates/plain.cf.j2
+++ b/states/postfix/templates/plain.cf.j2
@ -1 +0,0 @@
-{{ value }}