From 7b9f184c6b0e6164cfc08b5ae4b77970cc001194 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 24 Jan 2023 23:03:20 +0100 Subject: [PATCH 1/2] Revert "Split to OS specific common pillar" This reverts commit 4863396938c7c638517cbefc3a2773c9eb29bc69. --- pillar/{common/init.sls => common.sls} | 6 +++++- pillar/common/suse.sls | 6 ------ pillar/{common => }/postfix.sls | 0 3 files changed, 5 insertions(+), 7 deletions(-) rename pillar/{common/init.sls => common.sls} (69%) delete mode 100644 pillar/common/suse.sls rename pillar/{common => }/postfix.sls (100%) diff --git a/pillar/common/init.sls b/pillar/common.sls similarity index 69% rename from pillar/common/init.sls rename to pillar/common.sls index 7665aa6..d423f73 100644 --- a/pillar/common/init.sls +++ b/pillar/common.sls @@ -1,8 +1,12 @@ include: - role.salt.common - role.salt.minion - - common.{{ grains['os'] | lower }} 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/postfix.sls similarity index 100% rename from pillar/common/postfix.sls rename to pillar/postfix.sls -- 2.35.3 From 4bf9ac9413b0ab5668abd9a77c9be745b5bee136 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 24 Jan 2023 23:04:57 +0100 Subject: [PATCH 2/2] Include Postfix pillar via role Signed-off-by: Georg Pfuetzenreuter --- pillar/common.sls | 1 + pillar/{ => role/mta}/postfix.sls | 0 salt/common/suse.sls | 2 +- salt/{common => role/mta}/postfix.sls | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename pillar/{ => role/mta}/postfix.sls (100%) rename salt/{common => role/mta}/postfix.sls (100%) diff --git a/pillar/common.sls b/pillar/common.sls index d423f73..280886f 100644 --- a/pillar/common.sls +++ b/pillar/common.sls @@ -1,6 +1,7 @@ include: - role.salt.common - role.salt.minion + - role.mta.postfix managed_header_pound: | ### This file is managed via https://git.com.de/LibertaCasa/salt diff --git a/pillar/postfix.sls b/pillar/role/mta/postfix.sls similarity index 100% rename from pillar/postfix.sls rename to 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 similarity index 100% rename from salt/common/postfix.sls rename to salt/role/mta/postfix.sls -- 2.35.3