Include vhosts.d

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
fix(opensuse): pkgrepo.absent TypeError
2023-02-04 11:02:46 +01:00 · 2023-01-30 04:54:40 +01:00 · 2023-01-30 04:54:40 +01:00 · 2023-01-30 04:53:15 +01:00
2 changed files with 5 additions and 7 deletions
--- a/nginx/servers_config.sls
+++ b/nginx/servers_config.sls
@ -101,7 +101,6 @@ 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 }}:
@ -109,7 +108,7 @@ nginx_server_available_dir:
        - name: {{ server_curpath(server) }}
 {% do server_states.append(conf_state_id) %}
 {% else %}
-{% if server_enabled == True %}
+{% if settings.enabled == True %}
 {{ conf_state_id }}:
  file.managed:
    {{ sls_block(nginx.servers.managed_opts) }}
@ -143,7 +142,7 @@ nginx_server_available_dir:
 {% endif %}
 {% endif %}

-{% if settings.enabled is defined and server_enabled != None %}
+{% if settings.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)) -%}
@ -152,9 +151,9 @@ nginx_server_available_dir:
 {% if 'deleted' in settings and settings.deleted %}
 {{ manage_status(server, False, True) }}
 {% else %}
-{{ manage_status(server, server_enabled, False) }}
+{{ manage_status(server, settings.enabled, False) }}
 {% endif %}
-{% if server_enabled == True %}
+{% if settings.enabled == True %}
    - require:
      - file: {{ conf_state_id }}
 {% endif %}
--- a/pillar.example
+++ b/pillar.example
@ -202,9 +202,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 is disabled,
+        # may be true, false, or None where true is enabled, false, 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	e8ac65e867	Include vhosts.d Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-02-04 11:02:46 +01:00
Georg Pfuetzenreuter	bcd6274afd	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-01-30 04:54:40 +01:00
Georg Pfuetzenreuter	9ec7ed2b31	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-01-30 04:54:40 +01:00
Georg Pfuetzenreuter	df8cfaa6f0	fix(opensuse): update to openSUSE Leap >= 15.4 Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-01-30 04:53:15 +01:00