Skip to content

Commit

Permalink
main.cf: ignore only actually used keys of 'postfix:mapping'; fixes s…
Browse files Browse the repository at this point in the history
  • Loading branch information
alxwr committed Apr 24, 2019
1 parent c432ae2 commit 41603d6
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions postfix/files/main.cf
Original file line number Diff line number Diff line change
@@ -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.keys']('postfix:mapping') | default([], true) | list %}

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

0 comments on commit 41603d6

Please sign in to comment.