Include vhosts.d

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
fix(opensuse): pkgrepo.absent TypeError
2023-02-05 03:14:47 +01:00 · 2023-02-05 03:14:46 +01:00 · 2023-02-05 03:14:46 +01:00 · 2023-02-05 03:14:43 +01:00 · 2023-02-04 14:49:28 +01:00
2 changed files with 7 additions and 5 deletions
--- a/nginx/servers_config.sls
+++ b/nginx/servers_config.sls
@ -101,6 +101,7 @@ 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 }}:
@ -108,7 +109,7 @@ nginx_server_available_dir:
        - 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 %}
--- a/pillar.example
+++ b/pillar.example
@ -202,8 +202,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
Author	SHA1	Message	Date
Georg Pfuetzenreuter	b38ad00f9f	Include vhosts.d Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-02-05 03:14:47 +01:00
Georg Pfuetzenreuter	945f2958e3	fix(opensuse): pkgrepo.absent TypeError Repository can only be removed by name, other fields cause del_repo() to fail. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-02-05 03:14:46 +01:00
Georg Pfuetzenreuter	b4804e40fe	feat(opensuse): optional openSUSE devel repository All modern openSUSE releases (Leap 15.x, Tumbleweed) ship nginx in the default repositories. The devel repository should not be used unless the user knows what they are doing. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-02-05 03:14:46 +01:00
Georg Pfuetzenreuter	78d4f26c8f	fix(opensuse): update to openSUSE Leap >= 15.4 Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-02-05 03:14:43 +01:00
Georg Pfuetzenreuter	23df36ded9	feat(servers_config): enable configs 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 <mail@georg-pfuetzenreuter.net>	2023-02-04 14:49:28 +01:00