main.cf: ignore only actually used keys of 'postfix:mapping'; fixes s…

…altstack-formulas#89
alxwr · Apr 24, 2019 · efdb7f7 · efdb7f7
1 parent c432ae2
commit efdb7f7
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/postfix/files/main.cf b/postfix/files/main.cf
@@ -1,17 +1,7 @@
 {%- from "postfix/map.jinja" import postfix with context -%}
 {%- set config = salt['pillar.get']('postfix:config', {}) -%}
 
-{%- if not salt['pillar.get']('postfix:mapping', False) %}
-{#- Let the user configure mapping manually. -#}
-{%- set processed_parameters = [] %}
-{%- else -%}
-{#- TODO: alias_maps probably belongs here, too: #}
-{%- set processed_parameters = [
-        'virtual_alias_maps',
-        'smtp_sasl_password_maps',
-        'sender_canonical_maps',
-    ] %}
-{%- endif -%}
+{%- set processed_parameters = salt['pillar.keys']('postfix:mapping') | list %}
 
 {%- macro set_parameter(parameter, default=None) -%}
 {% set value = config.get(parameter, default) %}