feat(add purge option): purge sites option

This commit is contained in:
fthenard 2020-03-25 17:32:47 +01:00
parent 4636f102ae
commit a373bdab79
3 changed files with 6 additions and 0 deletions

View File

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

View File

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

View File

@ -174,6 +174,9 @@ nginx:
# partially exposes file.directory params for site available/enabled and # partially exposes file.directory params for site available/enabled and
# snippets dirs # snippets dirs
dir_opts: {} 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
##################### #####################