Skip to content

Commit

Permalink
fix: make necessary modifications to get working on salt-ssh
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed May 8, 2020
1 parent b64102f commit 34a112f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 6 additions & 0 deletions postfix/config.sls
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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', '') %}
Expand Down
1 change: 0 additions & 1 deletion postfix/files/main.cf
Original file line number Diff line number Diff line change
@@ -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. -#}
Expand Down
3 changes: 0 additions & 3 deletions postfix/files/master.cf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit 34a112f

Please sign in to comment.