saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(servers_config): craft states ids with server

Browse Source 
instead of `loop.index0` to get states easier to extend

BREAKING CHANGES: All `server_conf_{int}` and `server_state_{int}` will be renamed
to `nginx_{server}_server_config_file` and `nginx_{server}_server_state_symlink`
respectively
This commit is contained in:
sticky-note 2022-12-30 14:15:12 +11:00
parent 982705f1a6
commit ed23070fc1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nginx/servers_config.sls
View File

@ -101,7 +101,7 @@ nginx_server_available_dir:
# Managed enabled/disabled state for servers
{% for server, settings in nginx.servers.managed.items() %}
{% set conf_state_id = 'server_conf_' ~ loop.index0 %}
{%- set conf_state_id = 'nginx_' ~ server ~ '_server_config_file' %}
{% if 'deleted' in settings and settings.deleted %}
{{ conf_state_id }}:
file.absent:
@ -143,7 +143,7 @@ nginx_server_available_dir:
{% endif %}
{% if settings.enabled != None %}
{% set status_state_id = 'server_state_' ~ loop.index0 %}
{%- set status_state_id = 'nginx_' ~ server ~ '_server_state_symlink' %}
{%- 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)) -%}
{%- if enabled_dir != available_dir %}