Merge pull request #51 from andrew-vant/salt.d

Added recursive management of minion.d and master.d.

salt/master.sls

@@ -3,10 +3,11 @@
 salt-master:
   pkg.installed:
     - name: {{ pkgs['salt-master'] }}
-  file.managed:
-    - name: /etc/salt/master.d/master.conf
+  file.recurse:
+    - name: /etc/salt/master.d
     - template: jinja
-    - source: salt://salt/files/master
+    - source: salt://salt/files/master.d
+    - clean: True
   service.running:
     - enable: True
     - watch:

salt/minion.sls

@@ -3,10 +3,11 @@
 salt-minion:
   pkg.installed:
     - name: {{ pkgs['salt-minion'] }}
-  file.managed:
-    - name: /etc/salt/minion.d/minion.conf
+  file.recurse:
+    - name: /etc/salt/minion.d
     - template: jinja
-    - source: salt://salt/files/minion
+    - source: salt://salt/files/minion.d
+    - clean: True
   service.running:
     - enable: True
     - watch: