fix(deps): fixes ordering where postmap requires sane main.cf

Moved maps generation to config, and added dependency on main.cf generation. Solves centos8 problems.

Signed-off-by: Felipe Zipitria <[email protected]>

Author: Felipe Zipitria

docs/README.rst

@@ -53,7 +53,7 @@ Installs and starts postfix SMTP server
 ``postfix.config``
 ^^^^^^^^^^^^^^^^^^
 
-Manages postfix main.cf and optionally the master.cf configuration file
+Manages postfix main.cf and optionally the master.cf configuration file. Generates mappings.
 
 ``postfix.policyd-spf``
 ^^^^^^^^^^^^^^^^^^^^^^^

postfix/config.sls

@@ -101,3 +101,49 @@ postfix_{{ domain }}_ssl_key:
        - service: postfix
 
 {% endfor %}
+
+# 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 file_path.startswith('proxy:') %}
+    {#- Discard the proxy:-prefix #}
+    {%- set _, file_type, file_path = file_path.split(':') %}
+  {%- elif ':' in file_path %}
+    {%- set file_type, file_path = file_path.split(':') %}
+  {%- else %}
+    {%- set file_type = default_database_type %}
+  {%- endif %}
+  {%- if not file_path.startswith('/') %}
+    {%- set file_path = postfix.config_path ~ '/' ~ file_path %}
+  {%- endif %}
+  {%- if file_type in ("btree", "cdb", "dbm", "hash", "sdbm") %}
+    {%- set need_postmap = True %}
+  {%- endif %}
+postfix_{{ mapping }}:
+  file.managed:
+    - name: {{ file_path }}
+    - source: salt://postfix/files/mapping.j2
+    - user: root
+    - group: {{ postfix.root_grp }}
+    {%- if mapping.endswith('_sasl_password_maps') %}
+    - mode: 600
+    {%- else %}
+    - mode: 644
+    {%- endif %}
+    - template: jinja
+    - context:
+        data: {{ data|json() }}
+    - require:
+      - pkg: postfix
+      - file: {{ postfix.config_path }}/main.cf
+  {%- if need_postmap %}
+  cmd.wait:
+    - name: {{ postfix.xbin_prefix }}/sbin/postmap {{ file_path }}
+    - cwd: /
+    - watch:
+      - file: {{ file_path }}
+    - watch_in:
+      - service: postfix
+  {%- endif %}
+{% endfor %}

postfix/init.sls

@@ -94,48 +94,3 @@ postfix_alias_absent_{{ user }}:
   {%- endfor %}
 {% endif %}
 {% 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 file_path.startswith('proxy:') %}
-    {#- Discard the proxy:-prefix #}
-    {%- set _, file_type, file_path = file_path.split(':') %}
-  {%- elif ':' in file_path %}
-    {%- set file_type, file_path = file_path.split(':') %}
-  {%- else %}
-    {%- set file_type = default_database_type %}
-  {%- endif %}
-  {%- if not file_path.startswith('/') %}
-    {%- set file_path = postfix.config_path ~ '/' ~ file_path %}
-  {%- endif %}
-  {%- if file_type in ("btree", "cdb", "dbm", "hash", "sdbm") %}
-    {%- set need_postmap = True %}
-  {%- endif %}
-postfix_{{ mapping }}:
-  file.managed:
-    - name: {{ file_path }}
-    - source: salt://postfix/files/mapping.j2
-    - user: root
-    - group: {{ postfix.root_grp }}
-    {%- 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: {{ postfix.xbin_prefix }}/sbin/postmap {{ file_path }}
-    - cwd: /
-    - watch:
-      - file: {{ file_path }}
-    - watch_in:
-      - service: postfix
-  {%- endif %}
-{% endfor %}

test/integration/default/controls/postfix_mysql.rb

@@ -11,16 +11,16 @@ postfix:
       smtp:
         # Limit to no more than 10 smtp processes
         maxproc: 10
-      # Enable oldstyle TLS wrapped SMTP
+      # Disable oldstyle TLS wrapped SMTP
       smtps:
-        enable: true
+        enable: false
       # Enable submission service on port 587/tcp with custom options
       submission:
         enable: true
         args:
           - "-o smtpd_tls_security_level=encrypt"
           - "-o smtpd_sasl_auth_enable=yes"
-          - "-o smtpd_client_restrictions: permit_sasl_authenticated,reject"
+          - "-o smtpd_client_restrictions=permit_sasl_authenticated,reject"
       tlsproxy:
         enable: true
         chroot: true