Merge pull request #44 from jacksoncage/config-files

#12 Moved master and minion config file to .d folder
saltstack-formulas · Sep 8, 2014 · 1259f3e · 1259f3e
2 parents fba9280 + 75a1f88
commit 1259f3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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: