Adding and using postfix/master.sls

diff --git a/postfix/master.sls b/postfix/master.sls
new file mode 100644 (file)
index 0000000..d4a0fc4
--- /dev/null
+++ b/postfix/master.sls
@@ -0,0 +1,3 @@
+postfix:
+  is_satellite: False
+

diff --git a/top.sls b/top.sls
index 137d639b643f8c25f125858b0aff0bca18ced347..51470e0b4cd30bd4c4608cf49617254d1b6127c3 100644 (file)
--- a/top.sls
+++ b/top.sls
@@ -17,7 +17,8 @@ base:
 
   'sarah.uhu-banane.de':
     - location.pb-fra
-    - postfix.satellite
+    #- postfix.satellite
+    - postfix.master
     - debian.openssh
     - resolver.common
     - resolver.pb-fra
@@ -41,6 +42,7 @@ base:
     - resolver.common
     - bind.common
     - bind.primary
+    - apache
 
   'liz.nexunus.net':
     - location.hetzner