summaryrefslogtreecommitdiffstats
path: root/salt/common
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-01-24 21:26:04 +0100
committerGeorg Pfuetzenreuter2023-01-24 21:26:04 +0100
commitd83eb08f484219acbc375389d42e57b3da440ed9 (patch)
tree686376ed4b83c3d8c3b7d7323d8016d14123cfc2 /salt/common
parent2698d18625246773601855c5be1d1abebc706e8a (diff)
parent70036d224feb0cc73c61982aa284f77c9ad68904 (diff)
downloadsalt-d83eb08f484219acbc375389d42e57b3da440ed9.tar.gz
salt-d83eb08f484219acbc375389d42e57b3da440ed9.tar.bz2
salt-d83eb08f484219acbc375389d42e57b3da440ed9.zip
Merge pull request 'Manage global Postfix'es + make common pillar OS based' (#2) from postfix into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/2
Diffstat (limited to 'salt/common')
-rw-r--r--salt/common/postfix.sls3
-rw-r--r--salt/common/suse.sls1
2 files changed, 4 insertions, 0 deletions
diff --git a/salt/common/postfix.sls b/salt/common/postfix.sls
new file mode 100644
index 0000000..d5b51d4
--- /dev/null
+++ b/salt/common/postfix.sls
@@ -0,0 +1,3 @@
+include:
+ - postfix
+ - postfix.config
diff --git a/salt/common/suse.sls b/salt/common/suse.sls
index e655353..d76da87 100644
--- a/salt/common/suse.sls
+++ b/salt/common/suse.sls
@@ -3,6 +3,7 @@ include:
- profile.zypp
- profile.node_exporter
- users
+ - .postfix
{#- to-do: move this to some formula or macro -#}
{%- set osfullname = grains['osfullname'] -%}