Merge pull request #46 from johtso/issue-45

Add missing .conf to config files

salt/master.sls

@@ -4,7 +4,7 @@ salt-master:
   pkg.installed:
     - name: {{ pkgs['salt-master'] }}
   file.managed:
-    - name: /etc/salt/master.d/master
+    - name: /etc/salt/master.d/master.conf
     - template: jinja
     - source: salt://salt/files/master
   service.running:

salt/minion.sls

@@ -4,7 +4,7 @@ salt-minion:
   pkg.installed:
     - name: {{ pkgs['salt-minion'] }}
   file.managed:
-    - name: /etc/salt/minion.d/minion
+    - name: /etc/salt/minion.d/minion.conf
     - template: jinja
     - source: salt://salt/files/minion
   service.running: