Merge pull request #263 from Irsute/master

feat(add a purge dir option): add the option to purge sites-enable / …

Author: myii

nginx/map.jinja

@@ -162,6 +162,7 @@
             'makedirs': True,
         },
         'managed': {},
+        'purge_servers_config': False,
     },
     'passenger': {
         'passenger_root': '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini',

nginx/servers_config.sls

@@ -83,13 +83,15 @@ nginx_server_enabled_dir:
   file.directory:
     {{ sls_block(nginx.servers.dir_opts) }}
     - name: {{ nginx.lookup.server_enabled }}
+    - clean: {{ nginx.servers.purge_servers_config }}
 
 # If enabled and available are not the same, create available
 {% if nginx.lookup.server_enabled != nginx.lookup.server_available -%}
 nginx_server_available_dir:
   file.directory:
     {{ sls_block(nginx.servers.dir_opts) }}
     - name: {{ nginx.lookup.server_available }}
+    - clean: {{ nginx.servers.purge_servers_config }}
 {%- endif %}
 
 # Manage the actual server files

pillar.example

@@ -174,6 +174,9 @@ nginx:
     # partially exposes file.directory params for site available/enabled and
     # snippets dirs
     dir_opts: {}
+    # let the choice to purge site-available and site-enable folders before add new ones
+    # (if True it removes all non-salt-managed files)
+    purge_servers_config: false
 
 
     #####################