Merge pull request #111 from iggy/master

Switch config file.recurse to clean by default and tell it to ignore _*

salt/defaults.yaml

@@ -11,7 +11,7 @@ salt:
   salt_cloud: salt-cloud
   salt_api: salt-api
   salt_ssh: salt-ssh
-  clean_config_d_dir: False
+  clean_config_d_dir: True
 
   master:
     gitfs_provider: gitpython

salt/master.sls

@@ -10,6 +10,7 @@ salt-master:
     - template: jinja
     - source: salt://salt/files/master.d
     - clean: {{ salt_settings.clean_config_d_dir }}
+    - exclude_pat: _*
   service.running:
     - enable: True
     - name: {{ salt_settings.master_service }}
@@ -18,3 +19,9 @@ salt-master:
       - pkg: salt-master
 {% endif %}
       - file: salt-master
+      - file: remove-old-master-conf-file
+
+# clean up old _defaults.conf file if they have it around
+remove-old-master-conf-file:
+  file.absent:
+    - name: /etc/salt/master.d/_defaults.conf

salt/minion.sls

@@ -10,6 +10,7 @@ salt-minion:
     - template: jinja
     - source: salt://salt/files/minion.d
     - clean: {{ salt_settings.clean_config_d_dir }}
+    - exclude_pat: _*
     - context:
         standalone: False
   service.running:
@@ -20,3 +21,9 @@ salt-minion:
       - pkg: salt-minion
 {% endif %}
       - file: salt-minion
+      - file: remove-old-minion-conf-file
+
+# clean up old _defaults.conf file if they have it around
+remove-old-minion-conf-file:
+  file.absent:
+    - name: /etc/salt/minion.d/_defaults.conf

salt/standalone.sls

@@ -10,6 +10,7 @@ salt-minion:
     - template: jinja
     - source: salt://salt/files/minion.d
     - clean: {{ salt_settings.clean_config_d_dir }}
+    - exclude_pat: _*
     - context:
         standalone: True
   service.dead:
@@ -20,3 +21,8 @@ salt-minion:
       - pkg: salt-minion
 {% endif %}
       - file: salt-minion
+
+# clean up old _defaults.conf file if they have it around
+remove-old-standalone-conf-file:
+  file.absent:
+    - name: /etc/salt/minion.d/_defaults.conf