From fbaa2dcabb35fbac381ea502b7d5862c5205bb97 Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <aw@sz9i.net>
Date: Tue, 9 Apr 2019 20:12:23 +0200
Subject: [PATCH] main.cf: ignore only actually used keys of 'postfix:mapping';
 fixes #89

---
 postfix/files/main.cf | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/postfix/files/main.cf b/postfix/files/main.cf
index 1b701d6..9fbd6ef 100644
--- a/postfix/files/main.cf
+++ b/postfix/files/main.cf
@@ -1,17 +1,8 @@
 {%- 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 -%}
+{#- " | list": Python3.6 retuns dict_keys here, which needs to be converted into a list here. -#}
+{%- set processed_parameters = salt['pillar.get']('postfix:mapping', {}).keys() | list %}
 
 {%- macro set_parameter(parameter, default=None) -%}
 {% set value = config.get(parameter, default) %}