diff --git a/.forgejo/workflows/deploy-docs.yaml b/.forgejo/workflows/deploy-docs.yaml index 6e0acd6d..ed31e899 100644 --- a/.forgejo/workflows/deploy-docs.yaml +++ b/.forgejo/workflows/deploy-docs.yaml @@ -11,7 +11,7 @@ jobs: build: runs-on: docker container: - image: docker.io/library/python:3.14-trixie + image: docker.io/library/python:3.15-trixie steps: - name: Pipeline info run: | diff --git a/.forgejo/workflows/lint.yaml b/.forgejo/workflows/lint.yaml index 5c1b82ac..6a31829c 100644 --- a/.forgejo/workflows/lint.yaml +++ b/.forgejo/workflows/lint.yaml @@ -24,7 +24,7 @@ jobs: # work in our environmnet. # Rather manually setup python (pip) before instead. - name: Run ansible-lint - uses: https://github.com/ansible/ansible-lint@v26.6.0 + uses: https://github.com/ansible/ansible-lint@v26.10.1 with: setup_python: "false" requirements_file: "requirements.yml" diff --git a/inventories/chaosknoten/host_vars/cloud.yaml b/inventories/chaosknoten/host_vars/cloud.yaml index 8f299b2d..a441ac84 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: 34 # renovate: datasource=docker depName=docker.io/library/postgres -nextcloud__postgres_version: 15.18 +nextcloud__postgres_version: 15.19 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/inventories/chaosknoten/host_vars/netbox.yaml b/inventories/chaosknoten/host_vars/netbox.yaml index 312b1d70..e5ad93e4 100644 --- a/inventories/chaosknoten/host_vars/netbox.yaml +++ b/inventories/chaosknoten/host_vars/netbox.yaml @@ -1,5 +1,5 @@ # renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox -netbox__version: "v4.6.4" +netbox__version: "v4.7.4" netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}" netbox__custom_pipeline_oidc_group_and_role_mapping: true diff --git a/inventories/chaosknoten/host_vars/pad.yaml b/inventories/chaosknoten/host_vars/pad.yaml index 0c9b29ea..c2fa834f 100644 --- a/inventories/chaosknoten/host_vars/pad.yaml +++ b/inventories/chaosknoten/host_vars/pad.yaml @@ -13,4 +13,4 @@ nginx__configurations: content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/pad/nginx/pad.hamburg.ccc.de.conf') }}" # renovate: datasource=docker depName=quay.io/hedgedoc/hedgedoc -host_pad__docker_compose__hedgedoc_version: 1.11.1 +host_pad__docker_compose__hedgedoc_version: 1.12.0 diff --git a/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 b/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 index 3405a419..21bf5555 100644 --- a/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 @@ -2,7 +2,7 @@ services: prometheus: - image: docker.io/prom/prometheus:v3.13.1 + image: docker.io/prom/prometheus:v3.15.1 container_name: prometheus command: - '--config.file=/etc/prometheus/prometheus.yml' @@ -19,7 +19,7 @@ services: - prom_data:/prometheus alertmanager: - image: docker.io/prom/alertmanager:v0.33.1 + image: docker.io/prom/alertmanager:v0.34.2 container_name: alertmanager command: - '--config.file=/etc/alertmanager/alertmanager.yaml' @@ -32,7 +32,7 @@ services: - alertmanager_data:/alertmanager grafana: - image: docker.io/grafana/grafana:13.1.0 + image: docker.io/grafana/grafana:13.3.0 container_name: grafana ports: - 3000:3000 @@ -46,7 +46,7 @@ services: - graf_data:/var/lib/grafana pve-exporter: - image: docker.io/prompve/prometheus-pve-exporter:3.9.0 + image: docker.io/prompve/prometheus-pve-exporter:3.11.0 container_name: pve-exporter ports: - 9221:9221 diff --git a/resources/chaosknoten/hta/docker_compose/compose.yaml.j2 b/resources/chaosknoten/hta/docker_compose/compose.yaml.j2 index b8a63d96..0a5a58bd 100644 --- a/resources/chaosknoten/hta/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/hta/docker_compose/compose.yaml.j2 @@ -59,7 +59,7 @@ services: # Renders the PDF handouts (HTML to PDF with Chromium); needs internet access for the map tiles. gotenberg: - image: docker.io/gotenberg/gotenberg:8.38.1 + image: docker.io/gotenberg/gotenberg:8.39.0 command: ["gotenberg", "--api-timeout=60s", "--libreoffice-disable-routes"] networks: frontend: diff --git a/resources/chaosknoten/ntfy/docker_compose/compose.yaml.j2 b/resources/chaosknoten/ntfy/docker_compose/compose.yaml.j2 index a982bf3a..251cf73f 100644 --- a/resources/chaosknoten/ntfy/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/ntfy/docker_compose/compose.yaml.j2 @@ -1,7 +1,7 @@ --- services: ntfy: - image: docker.io/binwiederhier/ntfy:v2.26.0 + image: docker.io/binwiederhier/ntfy:v2.37.2 container_name: ntfy command: - serve diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 index 4538ede7..02a7d257 100644 --- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 @@ -15,7 +15,7 @@ services: - pretalx_net redis: - image: docker.io/library/redis:8.8.0 + image: docker.io/library/redis:8.10.3 restart: unless-stopped volumes: - redis:/data diff --git a/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 index 28cef213..aa59b5c7 100644 --- a/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 @@ -13,7 +13,7 @@ services: restart: unless-stopped redis: - image: docker.io/library/redis:8.8.0 + image: docker.io/library/redis:8.10.3 ports: - "6379:6379" volumes: diff --git a/resources/external/status/docker_compose/compose.yaml.j2 b/resources/external/status/docker_compose/compose.yaml.j2 index 638ebbe2..5b67faad 100644 --- a/resources/external/status/docker_compose/compose.yaml.j2 +++ b/resources/external/status/docker_compose/compose.yaml.j2 @@ -4,7 +4,7 @@ services: database: - image: docker.io/library/postgres:18.4 + image: docker.io/library/postgres:18.6 restart: always volumes: - ./database:/var/lib/postgresql @@ -16,7 +16,7 @@ services: - gatus gatus: - image: ghcr.io/twin/gatus:v5.36.0 + image: ghcr.io/twin/gatus:v5.38.0 restart: always ports: - "8080:8080" diff --git a/roles/ansible_pull/templates/ansible-pull-failure-notify.service.j2 b/roles/ansible_pull/files/ansible-pull-failure-notify.service similarity index 59% rename from roles/ansible_pull/templates/ansible-pull-failure-notify.service.j2 rename to roles/ansible_pull/files/ansible-pull-failure-notify.service index fa5d471d..30d90091 100644 --- a/roles/ansible_pull/templates/ansible-pull-failure-notify.service.j2 +++ b/roles/ansible_pull/files/ansible-pull-failure-notify.service @@ -3,5 +3,5 @@ Description=ansible-pull failure notifier [Service] Type=oneshot -ExecStart=/usr/local/sbin/ansible-pull-failure-notify.sh +ExecStart=ansible-pull-failure-notify User=root diff --git a/roles/ansible_pull/files/ansible-pull-reboot.service b/roles/ansible_pull/files/ansible-pull-reboot.service new file mode 100644 index 00000000..d6e5bc8d --- /dev/null +++ b/roles/ansible_pull/files/ansible-pull-reboot.service @@ -0,0 +1,7 @@ +[Unit] +Description=ansible-pull reboot, if required +After=ansible-pull.service + +[Service] +Type=oneshot +ExecStart=ansible-pull-reboot diff --git a/roles/ansible_pull/files/ansible-pull-reboot.sh b/roles/ansible_pull/files/ansible-pull-reboot.sh new file mode 100644 index 00000000..940334a5 --- /dev/null +++ b/roles/ansible_pull/files/ansible-pull-reboot.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Reboot, if /var/run/reboot-required or /var/run/ansible-reboot-required exist. +if [ -e /var/run/reboot-required ] || [ -e /var/run/ansible-reboot-required ]; then + systemctl reboot +fi diff --git a/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.service b/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.service new file mode 100644 index 00000000..ebed50ce --- /dev/null +++ b/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.service @@ -0,0 +1,8 @@ +[Unit] +Description=ansible-pull successful run timestamp exporter +After=ansible-pull.service +Before=ansible-pull-reboot.service + +[Service] +Type=oneshot +ExecStart=ansible-pull-successful-run-timestamp-exporter diff --git a/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.sh b/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.sh new file mode 100644 index 00000000..90969675 --- /dev/null +++ b/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -eo pipefail + +echo "ansible_pull_last_successful_run_timestamp_seconds $(date +%s)" > /var/lib/node_exporter_textfile/ansible_pull.prom.$$ +mv /var/lib/node_exporter_textfile/ansible_pull.prom.$$ /var/lib/node_exporter_textfile/ansible_pull.prom diff --git a/roles/ansible_pull/tasks/main.yaml b/roles/ansible_pull/tasks/main.yaml index 61a2635f..d8915be7 100644 --- a/roles/ansible_pull/tasks/main.yaml +++ b/roles/ansible_pull/tasks/main.yaml @@ -24,14 +24,28 @@ virtualenv: /usr/local/lib/ansible_pull_venv become: true -- name: ensure ansible-pull-failure-notify script installation exists - ansible.builtin.template: - src: ansible-pull-failure-notify.sh.j2 - dest: /usr/local/sbin/ansible-pull-failure-notify.sh +- name: ensure helper script installations exist + ansible.builtin.copy: + src: "{{ item }}.sh" + dest: "/usr/local/sbin/{{ item }}" owner: root group: root mode: "0755" become: true + loop: + - ansible-pull-successful-run-timestamp-exporter + - ansible-pull-reboot + +- name: ensure templated helper script installations exists + ansible.builtin.template: + src: "{{ item }}.sh.j2" + dest: "/usr/local/sbin/{{ item }}" + owner: root + group: root + mode: "0755" + become: true + loop: + - ansible-pull-failure-notify - name: ensure secrets directory exists ansible.builtin.file: @@ -51,7 +65,7 @@ group: "{{ ansible_pull__user }}" become: true -- name: ensure systemd services exists +- name: ensure templated systemd services exists ansible.builtin.template: src: "{{ item }}.j2" dest: "/etc/systemd/system/{{ item }}" @@ -61,7 +75,21 @@ become: true loop: - ansible-pull.service + notify: + - systemd daemon reload + +- name: ensure systemd services exists + ansible.builtin.copy: + src: "{{ item }}" + dest: "/etc/systemd/system/{{ item }}" + owner: root + group: root + mode: "0644" + become: true + loop: - ansible-pull-failure-notify.service + - ansible-pull-reboot.service + - ansible-pull-successful-run-timestamp-exporter.service notify: - systemd daemon reload diff --git a/roles/ansible_pull/templates/ansible-pull.service.j2 b/roles/ansible_pull/templates/ansible-pull.service.j2 index 8b5c9e86..7f12bc4e 100644 --- a/roles/ansible_pull/templates/ansible-pull.service.j2 +++ b/roles/ansible_pull/templates/ansible-pull.service.j2 @@ -3,6 +3,7 @@ Description=ansible-pull for configuration and maintenance After=network-online.target Wants=network-online.target OnFailure=ansible-pull-failure-notify.service +OnSuccess=ansible-pull-successful-run-timestamp-exporter.service ansible-pull-reboot.service [Service] Type=oneshot @@ -19,6 +20,3 @@ ExecStart=/usr/local/lib/ansible_pull_venv/bin/ansible-pull \ --inventory "{{ ansible_pull__inventory }}" \ "{{ ansible_pull__playbook }}" User={{ ansible_pull__user }} -ExecStartPost=/usr/bin/bash -c 'echo "ansible_pull_last_successful_run_timestamp_seconds $(date +%s)" > /var/lib/node_exporter_textfile/ansible_pull.prom.$$; mv /var/lib/node_exporter_textfile/ansible_pull.prom.$$ /var/lib/node_exporter_textfile/ansible_pull.prom' -# Reboot, if /var/run/reboot-required or /var/run/ansible-reboot-required exist. -ExecStartPost=/usr/bin/bash -c 'if [ -e /var/run/reboot-required ] || [ -e /var/run/ansible-reboot-required ]; then sudo systemctl reboot; fi'