From 0bbe56ba61c40ce8f181c43d6c41264a519afc82 Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Thu, 8 Oct 2026 15:30:16 +0200 Subject: [PATCH 1/6] 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 5c29a4e8..2264d06b 100644 --- a/inventories/chaosknoten/hosts.yaml +++ b/inventories/chaosknoten/hosts.yaml @@ -164,6 +164,7 @@ docker_compose_hosts: sunders: spaceapiccc: draupnir: + matrix-sync: nextcloud_hosts: hosts: cloud: @@ -256,6 +257,7 @@ infrastructure_authorized_keys_hosts: lists: forgejo-runner: forgejo-runner-external: + matrix-sync: wiki_hosts: hosts: eh22-wiki: @@ -293,6 +295,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 28beb845e5bea1a257e7147502818b1cce60a10b Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Thu, 8 Oct 2026 17:04:56 +0200 Subject: [PATCH 2/6] 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 086eb9ff464ed06947c791b7a64e3ce7732125c1 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 10 Oct 2026 23:38:48 +0200 Subject: [PATCH 3/6] auth-dns: add ptouch-print-server to ccchh.net --- resources/chaosknoten/auth-dns/zones/ccchh.net.zone | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone index e5c1d251..4c8e7c92 100644 --- a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone +++ b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone @@ -139,6 +139,7 @@ waybackproxy A 10.89.212.33 alnair A 10.89.210.23 TXT "Sun SparcStation 4 Retro" +ptouch-print-server A 10.89.208.14 ; ; Public Club Services ; From 106a5cb97a6aef6e617ed4234c57cb200aa428ab Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 10 Oct 2026 23:58:31 +0200 Subject: [PATCH 4/6] auth-dns: dooris has wrong ipv6 address --- resources/chaosknoten/auth-dns/zones/ccchh.net.zone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone index 4c8e7c92..6da66d1a 100644 --- a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone +++ b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone @@ -98,7 +98,7 @@ pi-dmx-werkstatt A 10.89.212.215 dooris A 10.89.208.16 - AAAA 2a07:c481:1:33::1c + AAAA 2a07:c481:1:d0::1c _acme-challenge.dooris CNAME 37caae1f-b77f-4eb1-aa71-dc3f7ed24360.auth.acmedns.hamburg.ccc.de. dooris-legacy A 10.89.208.31 From 42df2e4af16f2e2212529915741869c6b14817d6 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Sun, 11 Oct 2026 00:01:24 +0200 Subject: [PATCH 5/6] revert 106a5cb97a6aef6e617ed4234c57cb200aa428ab revert auth-dns: dooris has wrong ipv6 address --- resources/chaosknoten/auth-dns/zones/ccchh.net.zone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone index 6da66d1a..4c8e7c92 100644 --- a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone +++ b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone @@ -98,7 +98,7 @@ pi-dmx-werkstatt A 10.89.212.215 dooris A 10.89.208.16 - AAAA 2a07:c481:1:d0::1c + AAAA 2a07:c481:1:33::1c _acme-challenge.dooris CNAME 37caae1f-b77f-4eb1-aa71-dc3f7ed24360.auth.acmedns.hamburg.ccc.de. dooris-legacy A 10.89.208.31 From 743a7d609c3f9b2f2c0a8cbcd932be62de220272 Mon Sep 17 00:00:00 2001 From: Renovate Date: Mon, 12 Oct 2026 20:17:02 +0000 Subject: [PATCH 6/6] Update docker.io/onlyoffice/documentserver Docker tag to v10 --- resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2 b/resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2 index 58dddb22..cda2ca0e 100644 --- a/resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2 @@ -4,7 +4,7 @@ services: onlyoffice: - image: docker.io/onlyoffice/documentserver:9.4.0 + image: docker.io/onlyoffice/documentserver:10.0.0 restart: unless-stopped volumes: - "./onlyoffice/DocumentServer/logs:/var/log/onlyoffice"