saltstack-formulas/postfix-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main.cf: ignore only actually used keys of 'postfix:mapping'; fixes #89

Browse Source
This commit is contained in:
Alexander Weidinger 2019-04-09 20:12:23 +02:00
parent bb6746c5b7
commit fbaa2dcabb
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
postfix/files/main.cf
View File

@ -1,17 +1,8 @@
{%- from "postfix/map.jinja" import postfix with context -%} {%- from "postfix/map.jinja" import postfix with context -%}
{%- set config = salt['pillar.get']('postfix:config', {}) -%} {%- set config = salt['pillar.get']('postfix:config', {}) -%}
{%- if not salt['pillar.get']('postfix:mapping', False) %} {#- " | list": Python3.6 retuns dict_keys here, which needs to be converted into a list here. -#}
{#- Let the user configure mapping manually. -#} {%- set processed_parameters = salt['pillar.get']('postfix:mapping', {}).keys() | list %}
{%- 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 -%}
{%- macro set_parameter(parameter, default=None) -%} {%- macro set_parameter(parameter, default=None) -%}
{% set value = config.get(parameter, default) %} {% set value = config.get(parameter, default) %}