diff options
| -rw-r--r-- | pillar/common.sls (renamed from pillar/common/init.sls) | 7 | ||||
| -rw-r--r-- | pillar/common/suse.sls | 6 | ||||
| -rw-r--r-- | pillar/role/mta/postfix.sls (renamed from pillar/common/postfix.sls) | 0 | ||||
| -rw-r--r-- | salt/common/suse.sls | 2 | ||||
| -rw-r--r-- | salt/role/mta/postfix.sls (renamed from salt/common/postfix.sls) | 0 |
5 files changed, 7 insertions, 8 deletions
diff --git a/pillar/common/init.sls b/pillar/common.sls index 7665aa6..280886f 100644 --- a/pillar/common/init.sls +++ b/pillar/common.sls @@ -1,8 +1,13 @@ include: - role.salt.common - role.salt.minion - - common.{{ grains['os'] | lower }} + - role.mta.postfix managed_header_pound: | ### This file is managed via https://git.com.de/LibertaCasa/salt ### Manual changes will be overwritten + +{%- if grains['os'] == 'SUSE' %} +zypper: + refreshdb_force: False +{%- endif %} diff --git a/pillar/common/suse.sls b/pillar/common/suse.sls deleted file mode 100644 index f3456ed..0000000 --- a/pillar/common/suse.sls +++ /dev/null @@ -1,6 +0,0 @@ -include: - - .postfix - -zypper: - refreshdb_force: False - diff --git a/pillar/common/postfix.sls b/pillar/role/mta/postfix.sls index 15c3d07..15c3d07 100644 --- a/pillar/common/postfix.sls +++ b/pillar/role/mta/postfix.sls diff --git a/salt/common/suse.sls b/salt/common/suse.sls index d76da87..d4cd6a1 100644 --- a/salt/common/suse.sls +++ b/salt/common/suse.sls @@ -3,7 +3,7 @@ include: - profile.zypp - profile.node_exporter - users - - .postfix + - role.mta.postfix {#- to-do: move this to some formula or macro -#} {%- set osfullname = grains['osfullname'] -%} diff --git a/salt/common/postfix.sls b/salt/role/mta/postfix.sls index d5b51d4..d5b51d4 100644 --- a/salt/common/postfix.sls +++ b/salt/role/mta/postfix.sls |