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

Enable configurations by default #300

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

Enable configurations by default #300

Show file tree
Hide file tree
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
9 changes: 5 additions & 4 deletions nginx/servers_config.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,15 @@ nginx_server_available_dir:

# Managed enabled/disabled state for servers
{% for server, settings in nginx.servers.managed.items() %}
{% set server_enabled = settings.enabled | default(True) %}
{% set conf_state_id = 'server_conf_' ~ loop.index0 %}
{% if 'deleted' in settings and settings.deleted %}
{{ conf_state_id }}:
file.absent:
- name: {{ server_curpath(server) }}
{% do server_states.append(conf_state_id) %}
{% else %}
{% if settings.enabled == True %}
{% if server_enabled == True %}
{{ conf_state_id }}:
file.managed:
{{ sls_block(nginx.servers.managed_opts) }}
Expand Down Expand Up @@ -142,7 +143,7 @@ nginx_server_available_dir:
{% endif %}
{% endif %}

{% if settings.enabled != None %}
{% if settings.enabled is defined and server_enabled != None %}
{% set status_state_id = 'server_state_' ~ loop.index0 %}
{%- set enabled_dir = path_join(server, nginx.servers.managed.get(server).get('enabled_dir', nginx.lookup.server_enabled)) -%}
{%- set available_dir = path_join(server, nginx.servers.managed.get(server).get('available_dir', nginx.lookup.server_available)) -%}
Expand All @@ -151,9 +152,9 @@ nginx_server_available_dir:
{% if 'deleted' in settings and settings.deleted %}
{{ manage_status(server, False, True) }}
{% else %}
{{ manage_status(server, settings.enabled, False) }}
{{ manage_status(server, server_enabled, False) }}
{% endif %}
{% if settings.enabled == True %}
{% if server_enabled == True %}
- require:
- file: {{ conf_state_id }}
{% endif %}
Expand Down
3 changes: 2 additions & 1 deletion pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,9 @@ nginx:
# relative filename of server file
# (defaults to '/etc/nginx/sites-available/mysite')
mysite:
# may be true, false, or None where true is enabled, false, disabled,
# may be true, false, or None where true is enabled, false is disabled,
# and None indicates no action
# true without ".disabled" management if not specified
enabled: true

# This let's you add dependencies on other resources being applied for a
Expand Down