summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pillar/global/init.sls2
-rw-r--r--pillar/global/mta.sls (renamed from pillar/role/mta/postfix.sls)0
-rw-r--r--salt/common/suse.sls3
-rw-r--r--salt/role/mta/postfix.sls3
4 files changed, 3 insertions, 5 deletions
diff --git a/pillar/global/init.sls b/pillar/global/init.sls
index 280886f..98536a3 100644
--- a/pillar/global/init.sls
+++ b/pillar/global/init.sls
@@ -1,7 +1,7 @@
include:
- role.salt.common
- role.salt.minion
- - role.mta.postfix
+ - .mta
managed_header_pound: |
### This file is managed via https://git.com.de/LibertaCasa/salt
diff --git a/pillar/role/mta/postfix.sls b/pillar/global/mta.sls
index a992440..a992440 100644
--- a/pillar/role/mta/postfix.sls
+++ b/pillar/global/mta.sls
diff --git a/salt/common/suse.sls b/salt/common/suse.sls
index a107c3d..b4abd7a 100644
--- a/salt/common/suse.sls
+++ b/salt/common/suse.sls
@@ -3,7 +3,8 @@ include:
- profile.zypp
- profile.node_exporter
- users
- - role.mta.postfix
+ - postfix
+ - postfix.config
{#- to-do: move this to some formula or macro -#}
{%- set osfullname = grains['osfullname'] -%}
diff --git a/salt/role/mta/postfix.sls b/salt/role/mta/postfix.sls
deleted file mode 100644
index d5b51d4..0000000
--- a/salt/role/mta/postfix.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-include:
- - postfix
- - postfix.config