From 80f2a158083b85cd3247949ace29daf2f155a252 Mon Sep 17 00:00:00 2001 From: sticky-note Date: Fri, 30 Dec 2022 14:15:12 +1100 Subject: [PATCH] feat(servers_config): craft states ids with `server` 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 --- nginx/servers_config.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/servers_config.sls b/nginx/servers_config.sls index 6652d64a..fc4ceadb 100644 --- a/nginx/servers_config.sls +++ b/nginx/servers_config.sls @@ -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 %}