feat(servers_config): enable config by default

Don't require `enabled: true` - helps distributions without separate available/enabled directories and prevents error: "Rendering SLS 'production:nginx.servers' failed: Jinja variable 'list object' has no attribute 'enabled'" Signed-off-by: Georg Pfuetzenreuter <[email protected]>
saltstack-formulas · Feb 4, 2023 · 3f11d23 · 3f11d23
1 parent 982705f
commit 3f11d23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/nginx/servers_config.sls b/nginx/servers_config.sls
@@ -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) }}
@@ -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)) -%}
@@ -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 %}

diff --git a/pillar.example b/pillar.example
@@ -198,8 +198,8 @@ 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,
-        # and None indicates no action
+        # may be true, false, or None where true is enabled, false is disabled,
+        # and None indicates no action - true if not specified
         enabled: true
 
         # This let's you add dependencies on other resources being applied for a