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

Merge pull request #79 from bawuenet/osfamily_rework 

Rework of PR #69 to fix Issue #68
This commit is contained in:
Javier Bértoli 2018-10-04 12:05:47 -03:00 committed by GitHub
parent ca6b26e3ed f5d9a0e95d
commit 99efe7e0d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
postfix/map.jinja
View File

@ -2,13 +2,12 @@
# vim: ft=jinja # vim: ft=jinja
{% import_yaml "postfix/defaults.yaml" as defaults %} {% import_yaml "postfix/defaults.yaml" as defaults %}
{% import_yaml "postfix/osmap.yaml" as osmap %} {% import_yaml "postfix/osfamilymap.yaml" as os_familymap %}
{% set postfix = salt['grains.filter_by']( {% set postfix = salt['grains.filter_by'](
defaults, defaults,
merge=salt['grains.filter_by']( merge=salt['grains.filter_by'](
osmap, os_familymap,
grain='os',
merge=salt['pillar.get']('postfix:lookup', {}), merge=salt['pillar.get']('postfix:lookup', {}),
), ),
base='postfix') base='postfix')

0
postfix/osmap.yaml → postfix/osfamilymap.yaml
View File