From 548d761def5a32bf0a4136cd420fb0d8d85f1e68 Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Mon, 17 Aug 2026 09:20:13 +0200 Subject: [PATCH 1/3] Migrate officemail away --- .../chaosknoten/auth-dns/zones/hh.ccc.de.zone | 48 ++----------------- 1 file changed, 5 insertions(+), 43 deletions(-) diff --git a/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone b/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone index 41b7f26e..f603a3d1 100644 --- a/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone +++ b/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone @@ -1,15 +1,7 @@ $TTL 7200 -; es wird jetzt der hostname mail.hamburg.ccc.de nicht mehr -; verwendet, sondern statt dessen local-mail.hamburg.ccc.de -; die popeye fuehlt sich immer noch unter mail.hamburg.ccc.de -; angesprochen, und nimmt daher keine mails mit absender-adressen -; die sie nicht kennt an. -; ich hoffe diese aenderung arbeitet um diesen bug herum. -; - haegar 2001.11.14 - @ IN SOA auth-dns.hamburg.ccc.de. noc.hamburg.ccc.de. ( - 2024012601 + 2024012601 10800 3600 3600000 @@ -19,16 +11,18 @@ $TTL 7200 @ NS erfadns.ber.ccc.de. IN MX 5 nomail.ccc.de. -; IN MX 10 local-mail.hamburg.ccc.de. IN MX 23 nomail2.ccc.de. IN MX 42 nomail3.ccc.de. + ; public-reverse-proxy IN A 212.12.48.125 IN AAAA 2a00:14b0:4200:3000:125::1 -localhost IN A 127.0.0.1 +; Migration von großem C officemail zu Infra in Berlin, ggf. mit vollkorn/haegar klären +officemail IN CNAME officemail.office.ccc.de. +; Alter Kram, sollte nach der Netzwerkumstellung auf Chaosknoten überflüssig sein ; DMZ-Server: dmz-net IN A 212.12.50.208 @@ -39,35 +33,3 @@ LAN-212-12-51-128 IN A 212.12.51.128 gate IN A 212.12.51.129 END-212-12-51-143 IN A 212.12.51.143 - -; convience and email - -backup IN A 172.31.16.3 - IN AAAA 2001:6f8:126f:1:16:20:0:3 -; IN MX 5 nomail.ccc.de. - IN MX 10 local-mail.hamburg.ccc.de. - -officemail IN A 172.31.17.131 - IN MX 5 nomail.ccc.de. -; IN MX 10 local-mail.hamburg.ccc.de. - IN MX 23 nomail2.ccc.de. - IN MX 42 nomail3.ccc.de. - -orga IN CNAME orga.hamburg.ccc.de. - - -; Die alte World, aka popeye.crew-gmbh.de -; Legacy-Names, do not delete -world IN A 192.76.134.7 - IN MX 10 world -popeye IN A 192.76.134.7 - IN MX 10 world -uucp IN A 192.76.134.7 - -; ChaosVPN -hack IN NS cvpn-dns.hack -cvpn-dns.hack IN A 172.31.0.5 - - -; tmp test -merz.leck.eier IN TXT "kann er mal" From e9a5b711ae7c2cda16d0770ec4bed87a148c7d1b Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Mon, 17 Aug 2026 09:25:23 +0200 Subject: [PATCH 2/3] Start migrating config to Ansible The real file still lives in /opt/mailman on the host for now, need to migrate whole config into Ansible. --- .../lists/docker_compose/compose.yaml.j2 | 1 - .../lists/docker_compose/mailman-extra.cfg | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 index be0303fe..2a7ffdd8 100644 --- a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 @@ -37,7 +37,6 @@ services: - database:database volumes: - /opt/mailman/web:/opt/mailman-web-data - - ./configs/mailman-extra.cfg:/opt/mailman/core/mailman-extra.cfg - ./configs/settings_local.py:/opt/mailman-web/settings_local.py - ./files/templates:/opt/mailman-web/templates environment: diff --git a/resources/chaosknoten/lists/docker_compose/mailman-extra.cfg b/resources/chaosknoten/lists/docker_compose/mailman-extra.cfg index 1ca22f32..29bb00ce 100644 --- a/resources/chaosknoten/lists/docker_compose/mailman-extra.cfg +++ b/resources/chaosknoten/lists/docker_compose/mailman-extra.cfg @@ -4,3 +4,16 @@ [mailman] pending_request_life: 7d + +# This address is the "site owner" address. Certain messages which must be +# delivered to a human, but which can't be delivered to a list owner (e.g. a +# bounce from a list owner), will be sent to this address. It should point to +# a human. +site_owner: listops@hamburg.ccc.de + +[mta] +# remove any pre-existing DKIM headers from mails being forwarded through a +# list +remove_dkim_headers: yes + +# eof From 61722d415d011fc9ccb362fcf68c144e38973d4c Mon Sep 17 00:00:00 2001 From: Renovate Date: Mon, 17 Aug 2026 07:31:06 +0000 Subject: [PATCH 3/3] Update docker.io/library/postgres Docker tag to v16 --- inventories/chaosknoten/host_vars/cloud.yaml | 2 +- resources/chaosknoten/lists/docker_compose/compose.yaml.j2 | 2 +- resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventories/chaosknoten/host_vars/cloud.yaml b/inventories/chaosknoten/host_vars/cloud.yaml index 8f299b2d..844cf1bf 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: 16.15 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/lists/docker_compose/compose.yaml.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 index 2a7ffdd8..729d2c26 100644 --- a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 @@ -62,7 +62,7 @@ services: - POSTGRES_DB=mailmandb - POSTGRES_USER=mailman - "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}" - image: docker.io/library/postgres:12-alpine + image: docker.io/library/postgres:16-alpine volumes: - /opt/mailman/database:/var/lib/postgresql/data networks: diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 index 3c6e5daa..2a01e92c 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:16-alpine environment: - "POSTGRES_USER=pretalx" - "POSTGRES_PASSWORD={{ secret__pretalx_db_password }}"