Skip to content

Commit fbaa2dc

Browse files
committed
main.cf: ignore only actually used keys of 'postfix:mapping'; fixes #89
1 parent bb6746c commit fbaa2dc

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

postfix/files/main.cf

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
{%- from "postfix/map.jinja" import postfix with context -%}
22
{%- set config = salt['pillar.get']('postfix:config', {}) -%}
33

4-
{%- if not salt['pillar.get']('postfix:mapping', False) %}
5-
{#- Let the user configure mapping manually. -#}
6-
{%- set processed_parameters = [] %}
7-
{%- else -%}
8-
{#- TODO: alias_maps probably belongs here, too: #}
9-
{%- set processed_parameters = [
10-
'virtual_alias_maps',
11-
'smtp_sasl_password_maps',
12-
'sender_canonical_maps',
13-
] %}
14-
{%- endif -%}
4+
{#- " | list": Python3.6 retuns dict_keys here, which needs to be converted into a list here. -#}
5+
{%- set processed_parameters = salt['pillar.get']('postfix:mapping', {}).keys() | list %}
156

167
{%- macro set_parameter(parameter, default=None) -%}
178
{% set value = config.get(parameter, default) %}

0 commit comments

Comments
 (0)