From 471012928ad69320aa890bd9232e322ae1b396bb Mon Sep 17 00:00:00 2001 From: lilly Date: Sun, 7 Jun 2026 18:31:05 +0200 Subject: [PATCH 1/2] auth-dns: configure nameserver secondary solely to erfadns.ber.ccc.de --- .../chaosknoten/host_vars/auth-dns.yaml | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/inventories/chaosknoten/host_vars/auth-dns.yaml b/inventories/chaosknoten/host_vars/auth-dns.yaml index 41b11ae..8d0538e 100644 --- a/inventories/chaosknoten/host_vars/auth-dns.yaml +++ b/inventories/chaosknoten/host_vars/auth-dns.yaml @@ -5,12 +5,8 @@ alloy_config_additional: "{{ lookup('ansible.builtin.template', 'resources/chaos knot__dnssec_key_id: "auth-dns.hamburg.ccc.de-1" knot__remotes: - - id: ns-intern.hamburg.ccc.de - address: [ "2a00:14b0:f000:23::53", "172.31.17.53" ] - - id: ns.vie.ccc.de - address: [ "2a02:1b8:10:31::228", "146.255.57.228" ] - - id: ns2.vie.ccc.de - address: [ "2a02:8000:1000:102::188", "185.106.84.188" ] + - id: erfadns.ber.ccc.de + address: [ "2a02:8000:1000:101::196", "185.106.84.196" ] knot__catalog_zones: - domain: "hamburg.ccc.de.catalog." @@ -19,34 +15,34 @@ knot__catalog_zones: knot__zones: - domain: "hh.ccc.de." catalog_member: "hamburg.ccc.de.catalog." - notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ] + notify_targets: [ "erfadns.ber.ccc.de" ] content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone') }}" - domain: "ccchh.net." catalog_member: "hamburg.ccc.de.catalog." - notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ] + notify_targets: [ "erfadns.ber.ccc.de" ] content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/ccchh.net.zone') }}" - domain: "hamburg.ccc.de." catalog_member: "hamburg.ccc.de.catalog." - notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ] + notify_targets: [ "erfadns.ber.ccc.de" ] content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone') }}" - domain: "eh20.easterhegg.eu." catalog_member: "hamburg.ccc.de.catalog." - notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ] + notify_targets: [ "erfadns.ber.ccc.de" ] content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/eh20.easterhegg.eu.zone') }}" - domain: "eh22.easterhegg.eu." catalog_member: "hamburg.ccc.de.catalog." - notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ] + notify_targets: [ "erfadns.ber.ccc.de" ] content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone') }}" - domain: "diday.org." catalog_member: "hamburg.ccc.de.catalog." - notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ] + notify_targets: [ "erfadns.ber.ccc.de" ] content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/diday.org.zone') }}" - domain: "3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa." - notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ] + notify_targets: [ "erfadns.ber.ccc.de" ] content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa.zone') }}" From 690fde633f30457f12ded68220e7d7208a4b1578 Mon Sep 17 00:00:00 2001 From: Renovate Date: Tue, 9 Jun 2026 08:46:07 +0000 Subject: [PATCH 2/2] Update GitHub Artifact Actions to v7 --- .forgejo/workflows/deploy-docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy-docs.yaml b/.forgejo/workflows/deploy-docs.yaml index 537d983..8ece046 100644 --- a/.forgejo/workflows/deploy-docs.yaml +++ b/.forgejo/workflows/deploy-docs.yaml @@ -67,7 +67,7 @@ jobs: run: | rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" site/ infra-docs-deploy@public-web-static.hosts.hamburg.ccc.de:/var/www/infra-docs.hamburg.ccc.de/ - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v7 if: github.event_name == 'pull_request' with: name: docs-build