Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(vhosts): better cleanup solution #266

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(vhosts): better cleanup solution #266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions nginx/servers_config.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,13 @@ 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
Expand Down Expand Up @@ -157,3 +155,23 @@ nginx_server_available_dir:
{%- endif %} {# enabled != available_dir #}
{% endif %}
{% endfor %}


{# Add . and .. to make it easier to not clean those #}
{% set valid_sites = ['.', '..', ] %}

{# Take sites from nginx.servers.managed #}
{% for server, settings in salt['pillar.get']('nginx:servers:managed', {}).items() %}
{% do valid_sites.append(server) %}
{% endfor %}

{% if salt['file.directory_exists'](nginx.lookup.server_enabled) %}
{% for filename in salt['file.readdir'](nginx.lookup.server_enabled) %}
{% if filename not in valid_sites %}

{{ nginx.lookup.server_enabled ~ '/' ~ filename }}:
file.absent

{% endif %}
{% endfor %}
{% endif %}