From 3edbbb63ddf369b3c99a8a60acda7ae306537038 Mon Sep 17 00:00:00 2001 From: Renovate Date: Thu, 29 Oct 2026 14:16:52 +0000 Subject: [PATCH 1/7] Update docker.io/pretix/standalone Docker tag to v2026.9 --- resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 index 28cef213..a1dd1db3 100644 --- a/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 @@ -25,7 +25,7 @@ services: backend: pretix: - image: docker.io/pretix/standalone:2026.8 + image: docker.io/pretix/standalone:2026.9 command: ["all"] ports: - "8345:80" From 1dc38a5de076c8189b3182c4bfc1289264b15e6c Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Thu, 8 Oct 2026 15:30:16 +0200 Subject: [PATCH 2/7] Add matrix-sync compose setup --- .../host_vars/matrix-sync.sops.yaml | 6 ++++-- .../chaosknoten/host_vars/matrix-sync.yaml | 7 ++++++- inventories/chaosknoten/hosts.yaml | 3 +++ .../docker_compose/compose.yaml.j2 | 19 +++++++++++++++++++ ...2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs | 1 + ...LGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I | 1 + 6 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 create mode 100644 resources/chaosknoten/matrix-sync/docker_compose/config/!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs create mode 100644 resources/chaosknoten/matrix-sync/docker_compose/config/!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I diff --git a/inventories/chaosknoten/host_vars/matrix-sync.sops.yaml b/inventories/chaosknoten/host_vars/matrix-sync.sops.yaml index c2427295..79b70e20 100644 --- a/inventories/chaosknoten/host_vars/matrix-sync.sops.yaml +++ b/inventories/chaosknoten/host_vars/matrix-sync.sops.yaml @@ -1,4 +1,6 @@ ansible_pull__age_private_key: ENC[AES256_GCM,data:/+Ub9S/CRrSAeWX9cXzIMHjmDXwAh7hPSzXDnSh8iIZMJg+zW9c7mHqJV5B1AtDp9EQ+pSKpC1TdWuM0qGUABIi+cgZolWISXiI=,iv:lfHLyKsIgNhSm1pVERHT+2uMsP8PP8A49C9OAGsYkL0=,tag:AHRK8KuJJCZst+MsS3wXsw==,type:str] +matrix_sync__matrix_access_token: ENC[AES256_GCM,data:GCrbVRoAKaNR0ToedY0mf11YYsIXgKgP+xhPYKJ8+5Sc8iXjTLCyWIw=,iv:DpbIRKAno+GWbBnOfVLvCJYAjlTHVVMeROZKOGaeP88=,tag:UMWTY51aHR7SNK4G2YcrpQ==,type:str] +matrix_sync__keycloak_client_secret: ENC[AES256_GCM,data:5+NoUs/9QbxoUCJQwDTb4CqvRHP0ktXd9hEkfXoKx2Vgmd86Aqy6tv+ozrBh7LQVPurpSCnIkG6hSlQpjXs4WsXu6oarV2c4TsSWXFmsCpJPhmIIL0Q=,iv:cq6sd6eAwMsWve8rhyiI1v1O4jW7Xh4fH3H5zGAO4bQ=,tag:LVucuziDh2OgNzaof1qQGA==,type:str] sops: age: - enc: | @@ -30,8 +32,8 @@ sops: qIJBztm2souvOZDMZSmbhKRptvwVcjIUrZ09uNqAWe+j22gYNlQMtQ== -----END AGE ENCRYPTED FILE----- recipient: age1q7kz3pnfq6cvtn56rlfgs52efcvtcmaq4xny0va3x5wxj4vpgccsenwxk6 - lastmodified: "2026-10-08T12:20:28Z" - mac: ENC[AES256_GCM,data:3EAY9S9ZYjjXmqpV0DOZvc1ANHi4P2EhLM+WURsZPE0r1P8YDR0bAxbqilrCbm4U6WznACNfcoyn2esFy63t4va/TyVnLWfukqCUF0+xjd2ICMYTMsT2vzQDFDsBE1RDVJrWuCPC+hsZzBO0cRHrUBRgbWFuDa3eZHXxJl8YAWU=,iv:qNmzrSxrPozOSlh6re/czhUwnfgvAZfn9JQNADSqf3I=,tag:hQAb/WM1ytg3Avomt22P5A==,type:str] + lastmodified: "2026-10-08T12:40:22Z" + mac: ENC[AES256_GCM,data:6wKdBHTiBpqQ9F7xzt/DZpI/2D76O5ymdDDCl7gtvTL5rpCxMZyr4Ol/nlWqb2bbAVJPVdgBBVHPes6ENVNVhEXb45jZ/Dl2wAEwVfeso+VXOR2LKN1U6WU55G0tovZZlVxfI85tednSNXc9i0+2JQSEZsifUPU10KXITFMVjmY=,iv:tUcAObEkMWMC/RG2GbC7ev0O/JyobrkGZnGYJ7YYAhM=,tag:SDB4u+M1GytTMXLprX0ENw==,type:str] pgp: - created_at: "2026-10-08T12:18:55Z" enc: |- diff --git a/inventories/chaosknoten/host_vars/matrix-sync.yaml b/inventories/chaosknoten/host_vars/matrix-sync.yaml index 5b845582..58318093 100644 --- a/inventories/chaosknoten/host_vars/matrix-sync.yaml +++ b/inventories/chaosknoten/host_vars/matrix-sync.yaml @@ -1 +1,6 @@ -# tbd +docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2') }}" +docker_compose__configuration_files: + - name: "!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/matrix-sync/docker_compose/config/!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I') }}" + - name: "!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/matrix-sync/docker_compose/config/!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs') }}" diff --git a/inventories/chaosknoten/hosts.yaml b/inventories/chaosknoten/hosts.yaml index 8880311e..feedc3bf 100644 --- a/inventories/chaosknoten/hosts.yaml +++ b/inventories/chaosknoten/hosts.yaml @@ -165,6 +165,7 @@ docker_compose_hosts: sunders: spaceapiccc: draupnir: + matrix-sync: nextcloud_hosts: hosts: cloud: @@ -257,6 +258,7 @@ infrastructure_authorized_keys_hosts: lists: forgejo-runner: forgejo-runner-external: + matrix-sync: wiki_hosts: hosts: eh22-wiki: @@ -297,6 +299,7 @@ ansible_pull_hosts: auth-dns: forgejo-runner: forgejo-runner-external: + matrix-sync: msmtp_hosts: hosts: renovate_hosts: diff --git a/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 b/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 new file mode 100644 index 00000000..816c93a3 --- /dev/null +++ b/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 @@ -0,0 +1,19 @@ +--- + +services: + sync: + image: git.hamburg.ccc.de/ccchh/matrix-member-sync:latest + command: ["uv", "run", "main.py", "sync"] + environment: + MATRIX_HOMESERVER_URL: https://matrix.hamburg.ccc.de + MATRIX_USER: ccchh-room-sync + MATRIX_ACCESS_TOKEN: {{ matrix_sync__matrix_access_token }} + KEYCLOAK_URL: https://id.hamburg.ccc.de + KEYCLOAK_REALM: ccchh + KEYCLOAK_CLIENT_ID: matrix-sync + KEYCLOAK_CLIENT_SECRET: {{ matrix_sync__keycloak_client_secret }} + ROOM_ATTRIBUTES: "!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I=matrix-chaos,!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs=matrix-intern" + MANUAL_MEMBER_LISTS: /manual-member-lists + restart: unless-stopped + volumes: + - ./manual-member-lists:/manual-member-lists \ No newline at end of file diff --git a/resources/chaosknoten/matrix-sync/docker_compose/config/!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs b/resources/chaosknoten/matrix-sync/docker_compose/config/!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs new file mode 100644 index 00000000..374e493d --- /dev/null +++ b/resources/chaosknoten/matrix-sync/docker_compose/config/!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs @@ -0,0 +1 @@ +# Manual member lists for CCCHH @intern diff --git a/resources/chaosknoten/matrix-sync/docker_compose/config/!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I b/resources/chaosknoten/matrix-sync/docker_compose/config/!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I new file mode 100644 index 00000000..8ec2a998 --- /dev/null +++ b/resources/chaosknoten/matrix-sync/docker_compose/config/!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I @@ -0,0 +1 @@ +# Manual member lists for CCCHH @chaos From df4f065a303d0dd3e011dd67cc1b24d7db27be3e Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Thu, 8 Oct 2026 17:04:56 +0200 Subject: [PATCH 3/7] Sync about every 2 minutes --- .../chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 b/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 index 816c93a3..a4a314c7 100644 --- a/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 @@ -13,7 +13,8 @@ services: KEYCLOAK_CLIENT_ID: matrix-sync KEYCLOAK_CLIENT_SECRET: {{ matrix_sync__keycloak_client_secret }} ROOM_ATTRIBUTES: "!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I=matrix-chaos,!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs=matrix-intern" - MANUAL_MEMBER_LISTS: /manual-member-lists + MANUAL_MEMBER_LISTS: /configs + SYNC_INTERVAL: 123 restart: unless-stopped volumes: - - ./manual-member-lists:/manual-member-lists \ No newline at end of file + - ./configs:/configs \ No newline at end of file From 5c558950e447010584f2959cb6feeadf668d8ae7 Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Tue, 27 Oct 2026 12:29:24 +0100 Subject: [PATCH 4/7] Add log rotation --- .../chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 b/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 index a4a314c7..9871eec2 100644 --- a/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 @@ -17,4 +17,9 @@ services: SYNC_INTERVAL: 123 restart: unless-stopped volumes: - - ./configs:/configs \ No newline at end of file + - ./configs:/configs + logging: + driver: "json-file" + options: + max-size: "50m" + max-file: "3" From 47d4da604a5bf80e6afc68cb9233d7afb8775f4f Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 21 Sep 2026 21:14:16 +0200 Subject: [PATCH 5/7] ansible-lint: ignore more directories that aren't part of the repo --- .ansible-lint | 4 ++++ .yamllint.yaml | 1 + 2 files changed, 5 insertions(+) diff --git a/.ansible-lint b/.ansible-lint index e750c579..1ad596e4 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -3,7 +3,11 @@ skip_list: - "name[casing]" exclude_paths: + - .ansible/ - .forgejo/ - "**/*.sops.yaml" - ansible_collections/ + - collections/ - galaxy_roles/ + - docs/ + - resources/ diff --git a/.yamllint.yaml b/.yamllint.yaml index 7ad950c9..bf9c1e24 100644 --- a/.yamllint.yaml +++ b/.yamllint.yaml @@ -1,5 +1,6 @@ rules: brackets: + forbid: false min-spaces-inside: 1 max-spaces-inside: 1 min-spaces-inside-empty: 1 From 30ab1f2238caef9061abe71ed1e01418cb19c34b Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 29 Oct 2026 19:45:18 +0100 Subject: [PATCH 6/7] bump draupnir to 3.2.0 --- resources/chaosknoten/draupnir/docker_compose/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/chaosknoten/draupnir/docker_compose/compose.yaml b/resources/chaosknoten/draupnir/docker_compose/compose.yaml index 42bf8fda..e346c6bb 100644 --- a/resources/chaosknoten/draupnir/docker_compose/compose.yaml +++ b/resources/chaosknoten/draupnir/docker_compose/compose.yaml @@ -3,7 +3,7 @@ services: draupnir: - image: ghcr.io/the-draupnir-project/draupnir:v3.1.0 + image: ghcr.io/the-draupnir-project/draupnir:v3.2.0 command: [ "bot", "--draupnir-config", "/etc/draupnir/production.yaml" ] restart: unless-stopped volumes: From 6589a7e531905873fd6cb6484c6dbd0ff4a9b0b5 Mon Sep 17 00:00:00 2001 From: Renovate Date: Thu, 29 Oct 2026 20:17:14 +0000 Subject: [PATCH 7/7] Update docker.io/pretix/standalone Docker tag to v2026.9 --- resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 index 28cef213..a1dd1db3 100644 --- a/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 @@ -25,7 +25,7 @@ services: backend: pretix: - image: docker.io/pretix/standalone:2026.8 + image: docker.io/pretix/standalone:2026.9 command: ["all"] ports: - "8345:80"