From 75a1f888eb1a19bd1590f76106139ad947fbf0fb Mon Sep 17 00:00:00 2001
From: Love Nyberg <love@bloglovin.com>
Date: Mon, 8 Sep 2014 21:38:30 +0200
Subject: [PATCH] #12 Moved master and minion config file to .d

---
 salt/master.sls | 2 +-
 salt/minion.sls | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/master.sls b/salt/master.sls
index b910d5a..0f8d686 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -4,7 +4,7 @@ salt-master:
   pkg.installed:
     - name: {{ pkgs['salt-master'] }}
   file.managed:
-    - name: /etc/salt/master
+    - name: /etc/salt/master.d/master
     - template: jinja
     - source: salt://salt/files/master
   service.running:
diff --git a/salt/minion.sls b/salt/minion.sls
index 00c3ea0..21367fb 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -4,7 +4,7 @@ salt-minion:
   pkg.installed:
     - name: {{ pkgs['salt-minion'] }}
   file.managed:
-    - name: /etc/salt/minion
+    - name: /etc/salt/minion.d/minion
     - template: jinja
     - source: salt://salt/files/minion
   service.running: