Merge pull request 'Revert OS pillar split' (#4 ) from revert-ospillarsplit into production

Reviewed-on: #4
Include Postfix pillar via role
2023-01-24 23:29:11 +01:00 · 2023-01-24 23:16:56 +01:00 · 2023-01-24 23:03:20 +01:00
5 changed files with 7 additions and 8 deletions
--- a/pillar/common/init.sls
+++ b/pillar/common/init.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 %}
--- a/pillar/common/suse.sls
+++ b/pillar/common/suse.sls
@ -1,6 +0,0 @@
-include:
-  - .postfix
-
-zypper:
-  refreshdb_force: False
-
--- a/pillar/role/mta/postfix.sls
+++ b/pillar/role/mta/postfix.sls
--- 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'] -%}
--- a/salt/role/mta/postfix.sls
+++ b/salt/role/mta/postfix.sls
Author	SHA1	Message	Date
Georg Pfuetzenreuter	7305d70822	Merge pull request 'Revert OS pillar split' (#4 ) from revert-ospillarsplit into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #4	2023-01-24 23:29:11 +01:00
Georg Pfuetzenreuter	4bf9ac9413	Include Postfix pillar via role All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-01-24 23:16:56 +01:00
Georg Pfuetzenreuter	7b9f184c6b	Revert "Split to OS specific common pillar" This reverts commit 4863396938c7c638517cbefc3a2773c9eb29bc69.	2023-01-24 23:03:20 +01:00