From 7b8dab07b666612213855ab859f9374c4f32d648 Mon Sep 17 00:00:00 2001 From: June Date: Mon, 9 Feb 2026 17:49:49 +0100 Subject: [PATCH 1/3] distribution_check(role): remove role as it's not really needed As the roles are used internally only anyway, we don't need to specify compatbilities like this and don't properly use it anyway. --- roles/certbot/meta/main.yaml | 10 ---- roles/distribution_check/README.md | 13 ----- .../meta/argument_specs.yaml | 28 ---------- roles/distribution_check/tasks/main.yaml | 53 ------------------- roles/docker/meta/main.yaml | 10 ---- roles/dokuwiki/meta/main.yml | 10 ---- roles/nginx/meta/main.yaml | 10 ---- 7 files changed, 134 deletions(-) delete mode 100644 roles/certbot/meta/main.yaml delete mode 100644 roles/distribution_check/README.md delete mode 100644 roles/distribution_check/meta/argument_specs.yaml delete mode 100644 roles/distribution_check/tasks/main.yaml delete mode 100644 roles/docker/meta/main.yaml delete mode 100644 roles/dokuwiki/meta/main.yml delete mode 100644 roles/nginx/meta/main.yaml diff --git a/roles/certbot/meta/main.yaml b/roles/certbot/meta/main.yaml deleted file mode 100644 index 9b678e9..0000000 --- a/roles/certbot/meta/main.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -dependencies: - - role: distribution_check - vars: - distribution_check__distribution_support_spec: - - name: Debian - major_versions: - - 11 - - 12 - - 13 diff --git a/roles/distribution_check/README.md b/roles/distribution_check/README.md deleted file mode 100644 index 38e06fc..0000000 --- a/roles/distribution_check/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Role `distribution_check` - -This role checks if the distribution of the hosts is supported (part of the provided distribution support spec.) and fails if it's not. - -If a hosts distribution and either an accompanying distribution version, major version or release is supported, the role doesn't fail for the host in question. - -## Required Arguments - -For the required arguments look at the [`argument_specs.yaml`](./meta/argument_specs.yaml). - -## `hosts` - -The `hosts` for this role need to be the machines for which you want to make sure their distribution is supported. diff --git a/roles/distribution_check/meta/argument_specs.yaml b/roles/distribution_check/meta/argument_specs.yaml deleted file mode 100644 index 1d8bab9..0000000 --- a/roles/distribution_check/meta/argument_specs.yaml +++ /dev/null @@ -1,28 +0,0 @@ -argument_specs: - main: - options: - distribution_check__distribution_support_spec: - description: A spec specifying the supported distribution. - type: list - elements: dict - required: true - options: - name: - description: The name of the supported distribution. - type: str - required: true - versions: - description: The supported versions of the supported distribution. - type: list - elements: str - required: false - major_versions: - description: The supported major versions of the supported distribution. - type: list - elements: str - required: false - releases: - description: The supported releases of the supported distribution. - type: list - elements: str - required: false diff --git a/roles/distribution_check/tasks/main.yaml b/roles/distribution_check/tasks/main.yaml deleted file mode 100644 index 6522fc9..0000000 --- a/roles/distribution_check/tasks/main.yaml +++ /dev/null @@ -1,53 +0,0 @@ -- name: set fact holding list of supported distribution names - ansible.builtin.set_fact: - distribution_check__supported_distribution_names: "{{ distribution_check__distribution_support_spec - | community.general.json_query('[].name') }}" - -- name: fail on unsupported distribution (name) - ansible.builtin.fail: - msg: The hosts distribution (name) isn't supported. - when: ansible_facts['distribution'] not in distribution_check__supported_distribution_names - -- name: set facts for holding lists of supported distribution versions, major versions and releases - block: - - name: set fact holding list of supported distribution versions - ansible.builtin.set_fact: - distribution_check__supported_distribution_versions: "{{ distribution_check__distribution_support_spec - | community.general.json_query(distribution_check__supported_distribution_versions_query) }}" - vars: - distribution_check__supported_distribution_versions_query: "[?name=='{{ ansible_facts['distribution'] }}'].versions | [].to_string(@)" - - - name: set fact holding list of supported distribution major versions - ansible.builtin.set_fact: - distribution_check__supported_distribution_major_versions: "{{ distribution_check__distribution_support_spec - | community.general.json_query(distribution_check__supported_distribution_major_versions_query) }}" - vars: - distribution_check__supported_distribution_major_versions_query: "[?name=='{{ ansible_facts['distribution'] }}'].major_versions | [].to_string(@)" - - - name: set fact holding list of supported distribution releases - ansible.builtin.set_fact: - distribution_check__supported_distribution_releases: "{{ distribution_check__distribution_support_spec - | community.general.json_query(distribution_check__supported_distribution_releases_query) }}" - vars: - distribution_check__supported_distribution_releases_query: "[?name=='{{ ansible_facts['distribution'] }}'].releases | [].to_string(@)" - -- name: check for distribution version, major version and release support - block: - - name: set fact on whether the distribution version is supported - ansible.builtin.set_fact: - distribution_check__distribution_version_supported: "{{ ansible_facts['distribution_version'] in distribution_check__supported_distribution_versions }}" - - - name: set fact on whether the distribution major version is supported - ansible.builtin.set_fact: - distribution_check__distribution_major_version_supported: "{{ ansible_facts['distribution_major_version'] in distribution_check__supported_distribution_major_versions }}" # noqa: yaml[line-length] - - - name: set fact on whether the distribution release is supported - ansible.builtin.set_fact: - distribution_check__distribution_release_supported: "{{ ansible_facts['distribution_release'] in distribution_check__supported_distribution_releases }}" - -- name: fail, if neither the distributions version, major version or release is supported - ansible.builtin.fail: - msg: Neither the hosts distribution version, major version or release is supported. - when: not (distribution_check__distribution_version_supported - or distribution_check__distribution_major_version_supported - or distribution_check__distribution_release_supported) diff --git a/roles/docker/meta/main.yaml b/roles/docker/meta/main.yaml deleted file mode 100644 index 9b678e9..0000000 --- a/roles/docker/meta/main.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -dependencies: - - role: distribution_check - vars: - distribution_check__distribution_support_spec: - - name: Debian - major_versions: - - 11 - - 12 - - 13 diff --git a/roles/dokuwiki/meta/main.yml b/roles/dokuwiki/meta/main.yml deleted file mode 100644 index 9b678e9..0000000 --- a/roles/dokuwiki/meta/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -dependencies: - - role: distribution_check - vars: - distribution_check__distribution_support_spec: - - name: Debian - major_versions: - - 11 - - 12 - - 13 diff --git a/roles/nginx/meta/main.yaml b/roles/nginx/meta/main.yaml deleted file mode 100644 index 78bb770..0000000 --- a/roles/nginx/meta/main.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -dependencies: - - role: distribution_check - vars: - distribution_check__distribution_support_spec: - - name: Debian - major_versions: - - "11" - - "12" - - "13" From db70d666d1d3ac2a640f2d04e1229d6300dfb366 Mon Sep 17 00:00:00 2001 From: June Date: Mon, 9 Feb 2026 19:53:27 +0100 Subject: [PATCH 2/3] vscode settings: exclude vendored collections and roles from search --- .vscode/settings.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 904d8da..2d43539 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,7 @@ "search.exclude": { "/playbooks/roles/": true, "/playbooks/resources/": true, + "/ansible_collections/": true, + "/galaxy-roles/": true, }, } From 68b7a4a342d0794269df3f5ae0afe065d5b8f782 Mon Sep 17 00:00:00 2001 From: Renovate Date: Mon, 9 Feb 2026 19:00:56 +0000 Subject: [PATCH 3/3] Update docker.io/library/postgres Docker tag to v18 --- inventories/chaosknoten/host_vars/cloud.yaml | 2 +- resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 | 2 +- resources/chaosknoten/lists/docker_compose/compose.yaml | 2 +- resources/chaosknoten/pad/docker_compose/compose.yaml.j2 | 2 +- resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 | 2 +- resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inventories/chaosknoten/host_vars/cloud.yaml b/inventories/chaosknoten/host_vars/cloud.yaml index b6cf771..1164730 100644 --- a/inventories/chaosknoten/host_vars/cloud.yaml +++ b/inventories/chaosknoten/host_vars/cloud.yaml @@ -1,7 +1,7 @@ # renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud nextcloud__version: 32 # renovate: datasource=docker depName=docker.io/library/postgres -nextcloud__postgres_version: 15.15 +nextcloud__postgres_version: 18.1 nextcloud__fqdn: cloud.hamburg.ccc.de nextcloud__data_dir: /data/nextcloud nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}" diff --git a/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 b/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 index a260ab1..562df5c 100644 --- a/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 @@ -46,7 +46,7 @@ services: - "8080:8080" db: - image: docker.io/library/postgres:15.15 + image: docker.io/library/postgres:18.1 restart: unless-stopped networks: - keycloak diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml b/resources/chaosknoten/lists/docker_compose/compose.yaml index cdfd70a..7050a8b 100644 --- a/resources/chaosknoten/lists/docker_compose/compose.yaml +++ b/resources/chaosknoten/lists/docker_compose/compose.yaml @@ -56,7 +56,7 @@ services: - POSTGRES_DB=mailmandb - POSTGRES_USER=mailman - POSTGRES_PASSWORD=wvQjbMRnwFuxGEPz - image: docker.io/library/postgres:12-alpine + image: docker.io/library/postgres:18-alpine volumes: - /opt/mailman/database:/var/lib/postgresql/data networks: diff --git a/resources/chaosknoten/pad/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pad/docker_compose/compose.yaml.j2 index 790cf95..e13191a 100644 --- a/resources/chaosknoten/pad/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/pad/docker_compose/compose.yaml.j2 @@ -3,7 +3,7 @@ services: database: - image: docker.io/library/postgres:15-alpine + image: docker.io/library/postgres:18-alpine environment: - "POSTGRES_USER=hedgedoc" - "POSTGRES_PASSWORD={{ secret__hedgedoc_db_password }}" diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 index 091d113..2f6f990 100644 --- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 @@ -3,7 +3,7 @@ services: database: - image: docker.io/library/postgres:15-alpine + image: docker.io/library/postgres:18-alpine environment: - "POSTGRES_USER=pretalx" - "POSTGRES_PASSWORD={{ secret__pretalx_db_password }}" diff --git a/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 index 938883b..3d35c0b 100644 --- a/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 @@ -1,7 +1,7 @@ --- services: database: - image: docker.io/library/postgres:15-alpine + image: docker.io/library/postgres:18-alpine environment: - "POSTGRES_USER=pretix" - "POSTGRES_PASSWORD={{ secret__pretix_db_password }}"