Merge pull request #104 from myii/bug/fix-for-salt-ssh

fix: make necessary modifications to get working on `salt-ssh`
This commit is contained in:
Imran Iqbal 2020-05-12 14:45:02 +01:00 committed by GitHub
commit 25441cb23c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions

View File

@ -21,6 +21,8 @@ include:
- watch_in:
- service: postfix
- template: jinja
- context:
postfix: {{ postfix|tojson }}
{% if 'vmail' in pillar.get('postfix', '') %}
{{ postfix.config_path }}/virtual_alias_maps.cf:
@ -61,6 +63,7 @@ include:
{% endif %}
{% if salt['pillar.get']('postfix:manage_master_config', True) %}
{% import_yaml "postfix/services.yaml" as postfix_master_services %}
{{ postfix.config_path }}/master.cf:
file.managed:
- source: salt://postfix/files/master.cf
@ -72,6 +75,9 @@ include:
- watch_in:
- service: postfix
- template: jinja
- context:
postfix: {{ postfix|tojson }}
postfix_master_services: {{ postfix_master_services|tojson }}
{% endif %}
{% if 'transport' in pillar.get('postfix', '') %}

View File

@ -1,4 +1,3 @@
{%- from "postfix/map.jinja" import postfix with context -%}
{%- set config = salt['pillar.get']('postfix:config', {}) -%}
{#- " | list": Python3.6 retuns dict_keys here, which needs to be converted into a list here. -#}

View File

@ -1,7 +1,4 @@
{%- from "postfix/map.jinja" import postfix with context -%}
{%- set master_config = salt['pillar.get']('postfix:master_config', {}) -%}
{% import_yaml "postfix/services.yaml" as postfix_master_services %}
{#-
# Handle the case that the pillar data does not provide any service
# configuration but submission parameters are provided in the pillar.