diff options
| author | Georg Pfuetzenreuter | 2023-01-24 23:29:11 +0100 |
|---|---|---|
| committer | Georg Pfuetzenreuter | 2023-01-24 23:29:11 +0100 |
| commit | 7305d708229241791102e044ad145405f5e71423 (patch) | |
| tree | a6bd4d887cbb95f3a1b736880f684b0774646c81 /pillar | |
| parent | 342affc1b8d8a3c6152de27e809a63e6cc86b043 (diff) | |
| parent | 4bf9ac9413b0ab5668abd9a77c9be745b5bee136 (diff) | |
| download | salt-7305d708229241791102e044ad145405f5e71423.tar.gz salt-7305d708229241791102e044ad145405f5e71423.tar.bz2 salt-7305d708229241791102e044ad145405f5e71423.zip | |
Merge pull request 'Revert OS pillar split' (#4) from revert-ospillarsplit into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/4
Diffstat (limited to 'pillar')
| -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 |
3 files changed, 6 insertions, 7 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 |