From f7306b91a67aac28e721d744fe9a93a2077ca72c Mon Sep 17 00:00:00 2001 From: lilly Date: Wed, 6 May 2026 14:34:34 +0200 Subject: [PATCH] remove unused dns zones --- .../chaosknoten/host_vars/auth-dns.yaml | 3 - .../auth-dns/zones/0.0.127.in-addr.arpa.zone | 12 --- .../chaosknoten/auth-dns/zones/127.0.0.zone | 11 --- .../auth-dns/zones/168.192.in-addr.arpa.zone | 10 -- .../zones/17.31.172.in-addr.arpa.zone | 49 ---------- resources/chaosknoten/auth-dns/zones/Makefile | 93 ------------------- .../chaosknoten/auth-dns/zones/localhost.zone | 12 --- .../auth-dns/zones/old-old/ccc.zone | 61 ------------ .../auth-dns/zones/old-old/vpn.hh.ccc.zone | 37 -------- 9 files changed, 288 deletions(-) delete mode 100644 resources/chaosknoten/auth-dns/zones/0.0.127.in-addr.arpa.zone delete mode 100644 resources/chaosknoten/auth-dns/zones/127.0.0.zone delete mode 100644 resources/chaosknoten/auth-dns/zones/168.192.in-addr.arpa.zone delete mode 100644 resources/chaosknoten/auth-dns/zones/17.31.172.in-addr.arpa.zone delete mode 100644 resources/chaosknoten/auth-dns/zones/Makefile delete mode 100644 resources/chaosknoten/auth-dns/zones/localhost.zone delete mode 100644 resources/chaosknoten/auth-dns/zones/old-old/ccc.zone delete mode 100644 resources/chaosknoten/auth-dns/zones/old-old/vpn.hh.ccc.zone diff --git a/inventories/chaosknoten/host_vars/auth-dns.yaml b/inventories/chaosknoten/host_vars/auth-dns.yaml index 2fa8f91..bff4b10 100644 --- a/inventories/chaosknoten/host_vars/auth-dns.yaml +++ b/inventories/chaosknoten/host_vars/auth-dns.yaml @@ -10,9 +10,6 @@ knot__catalog_zones: - domain: "hamburg.ccc.de.catalog." knot__zones: - # - domain: "hamburg.ccc.de." - # catalog_member: "hamburg.ccc.de.catalog." - # content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone') }}" - domain: "hh.ccc.de." catalog_member: "hamburg.ccc.de.catalog." notify_targets: [ "ns-intern.hamburg.ccc.de" ] diff --git a/resources/chaosknoten/auth-dns/zones/0.0.127.in-addr.arpa.zone b/resources/chaosknoten/auth-dns/zones/0.0.127.in-addr.arpa.zone deleted file mode 100644 index 770447b..0000000 --- a/resources/chaosknoten/auth-dns/zones/0.0.127.in-addr.arpa.zone +++ /dev/null @@ -1,12 +0,0 @@ -$ORIGIN 0.0.127.in-addr.arpa. -$TTL 7200 - -@ 1D IN SOA localhost. root.localhost. ( - 42 ; serial (d. adams) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum - - 1D IN NS localhost. -1 1D IN PTR localhost. diff --git a/resources/chaosknoten/auth-dns/zones/127.0.0.zone b/resources/chaosknoten/auth-dns/zones/127.0.0.zone deleted file mode 100644 index b9b7bf5..0000000 --- a/resources/chaosknoten/auth-dns/zones/127.0.0.zone +++ /dev/null @@ -1,11 +0,0 @@ -$ORIGIN 0.0.127.in-addr.arpa. - -@ 1D IN SOA localhost. root.localhost. ( - 42 ; serial (d. adams) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum - - 1D IN NS localhost. -1 1D IN PTR localhost. diff --git a/resources/chaosknoten/auth-dns/zones/168.192.in-addr.arpa.zone b/resources/chaosknoten/auth-dns/zones/168.192.in-addr.arpa.zone deleted file mode 100644 index 910c596..0000000 --- a/resources/chaosknoten/auth-dns/zones/168.192.in-addr.arpa.zone +++ /dev/null @@ -1,10 +0,0 @@ -$TTL 7200 - -@ IN SOA ns.hamburg.ccc.de. hostmaster.ccc.de. ( - 2016111701 - 10800 - 3600 - 3600000 - 86400 ) - - IN NS ns.hamburg.ccc.de. diff --git a/resources/chaosknoten/auth-dns/zones/17.31.172.in-addr.arpa.zone b/resources/chaosknoten/auth-dns/zones/17.31.172.in-addr.arpa.zone deleted file mode 100644 index dd13af3..0000000 --- a/resources/chaosknoten/auth-dns/zones/17.31.172.in-addr.arpa.zone +++ /dev/null @@ -1,49 +0,0 @@ -$TTL 7200 - -@ IN SOA auth-dns.hamburg.ccc.de. noc.hamburg.ccc.de. ( - 2025020101 - 10800 - 3600 - 3600000 - 86400 ) - - IN NS ns-intern.hamburg.ccc.de. - -1 IN PTR turing-vzhost.hamburg.ccc.de. -14 IN PTR attraktor-intern.hamburg.ccc.de. -53 IN PTR ns-intern.hamburg.ccc.de. -122 IN PTR oldturing.hamburg.ccc.de. -129 IN PTR turing-router.hamburg.ccc.de. -131 IN PTR officemail.hh.ccc.de. -132 IN PTR turing-new.hamburg.ccc.de. -133 IN PTR gitlab-intern.hamburg.ccc.de. -134 IN PTR jabber-intern.hamburg.ccc.de. -135 IN PTR turing-db.hamburg.ccc.de. -136 IN PTR chaosvpn-dns.hamburg.ccc.de. -137 IN PTR attraktor-intern2.hamburg.ccc.de. -138 IN PTR gitlab-test-intern.hamburg.ccc.de. -139 IN PTR gitlab-runner.hamburg.ccc.de. -142 IN PTR turing-intern2.hamburg.ccc.de. -143 IN PTR cloud-intern.hamburg.ccc.de. -144 IN PTR keycloak-intern.hamburg.ccc.de. -145 IN PTR grafana-intern.hamburg.ccc.de. -146 IN PTR wiki-intern.hamburg.ccc.de. -147 IN PTR onlyoffice-intern.hamburg.ccc.de. -148 IN PTR tickets-intern.hamburg.ccc.de. -149 IN PTR netbox-intern.hamburg.ccc.de. -150 IN PTR matrix-intern.hamburg.ccc.de. -151 IN PTR public-web-static-intern.hamburg.ccc.de. -152 IN PTR zammad-intern.hamburg.ccc.de. -153 IN PTR ns-intern2.hamburg.ccc.de. -156 IN PTR ccchoir-intern.hamburg.ccc.de. -157 IN PTR pretalx-intern.hamburg.ccc.de. -163 IN PTR renovate-forgejo.hamburg.ccc.de -180 IN PTR rproxy-intern.hamburg.ccc.de. -199 IN PTR template.hamburg.ccc.de. -201 IN PTR cow-intern.hamburg.ccc.de. -202 IN PTR forgejo-runner-builder.hamburg.ccc.de. -202 IN PTR forgejo-runner-ubuntu.hamburg.ccc.de. -204 IN PTR eh22hub-intern.hamburg.ccc.de. -212 IN PTR eh20-intern.hamburg.ccc.de. -213 IN PTR cryptoparty-intern.hamburg.ccc.de. -254 IN PTR chaosknoten.hamburg.ccc.de. diff --git a/resources/chaosknoten/auth-dns/zones/Makefile b/resources/chaosknoten/auth-dns/zones/Makefile deleted file mode 100644 index d3b6687..0000000 --- a/resources/chaosknoten/auth-dns/zones/Makefile +++ /dev/null @@ -1,93 +0,0 @@ - -CHANGED = $(shell git diff --name-only --relative -- '*.zone' ) - -export GIT_AUTHOR_NAME = "Bind Makefile" -#export GIT_AUTHOR_EMAIL = "$(shell whoami)@$(shell hostname -f)" -#export GIT_COMMITTER_NAME = $(GIT_AUTHOR_NAME) -#export GIT_COMMITTER_EMAIL = $(GIT_AUTHOR_EMAIL) - -all: rollover -install: rollover - -rollover: autoserial diff check reload eof - - -diff: - @echo "Diff Zones... " - @git diff -U0 -- $(CHANGED) \ - | grep -a -v -E '^(diff |index |---|@@)' \ - | sed -e 's/^[+]* .\/\([^ ]*\).*/=> \1/' - -autoserial: - @for file in $(CHANGED); do \ - perl -p -i -e 'if ($$p =~ /[\t\s]+IN[\t\s]+SOA[\t\s]+/) { $$stamp = sprintf("%4.4d%02.2d%02.2d", (localtime)[5]+1900, (localtime)[4]+1, (localtime)[3]); $$count = (/$$stamp([0-9]{2})/)? $$1 + 1: 1; s/[0-9]+/sprintf("%s%02.2d", $$stamp, $$count)/e; } $$p = $$_;' $$file; \ - done - -check: - @echo "Checking Configs... " - @if ! named-checkconf /etc/bind/named.conf; then \ - echo "FIX THE ERROR AND TRY AGAIN"; \ - exit 1 ; \ - fi - - @echo "Checking Zones... " - @named-checkconf -j -p /etc/bind/named.conf \ - | perl -e 'my $$zone = ""; while (<>) { if (/^\s+zone\s+\"(.*)\"/) { $$zone = $$1; } elsif (($$zone ne "") && /^\s+file\s+\"(.*?)\"/) { print "$$zone $$1\n"; $$zone = ""; } }' \ - | sort \ - | uniq \ - | while read zone file; do \ - echo "FOO: zone: $$zone file: $$file"; \ - if [ -z "$$file" -o "$$zone" = "key" ] ; then \ - continue ; \ - fi ; \ - if echo -n "$$zone" | grep -q -E '(sc-eur.com|db.root|named.dump|named.stats)'; then \ - continue; \ - fi; \ - if ! named-checkzone -q -i "full" $$zone $$file; then \ - named-checkzone -i "full" $$zone $$file; \ - echo "FIX THE ERROR AND TRY AGAIN"; \ - exit 1 ; \ - fi; \ - done - -#@echo "Checking CNAMEs and PTRs... " -#@grep -l -E '.*(PTR|CNAME).*[^.]*[.][^.]*[^.]$$' *.* \ -#| grep -v '\.sh$$' \ -#| while read file; do \ -# echo "$$file: DO NOT FORGET THE LAST DOT"; \ -# grep -E '.*(PTR|CNAME).*[^.]*[.][^.]*[^.]$$' $$file; \ -# exit 1 ; \ -#done - -reload: - @while [ "$$answer" = "" ]; do \ - echo -n "Do you want to reload all zones ? [yes] "; \ - read answer; \ - case $$answer in \ - [Yy]|[Yy][Ee][Ss]) \ - answer="yes"; \ - break; \ - ;; \ - [Nn]|[Nn][Oo]) \ - answer="no"; \ - break; \ - ;; \ - "") \ - answer="yes"; \ - break; \ - ;; \ - *) \ - answer=""; \ - ;; \ - esac; \ - done; \ - if [ "$$answer" = "yes" ]; then \ - etckeeper commit "Changed DNS Zones: $(CHANGED)" ; \ - rndc reload; \ - else \ - echo "Server reload aborted"; \ - exit 1 ; \ - fi - -eof: - @echo "DONE -- That's all folks!" diff --git a/resources/chaosknoten/auth-dns/zones/localhost.zone b/resources/chaosknoten/auth-dns/zones/localhost.zone deleted file mode 100644 index 0ef6b01..0000000 --- a/resources/chaosknoten/auth-dns/zones/localhost.zone +++ /dev/null @@ -1,12 +0,0 @@ -$ORIGIN localhost. -$TTL 7200 - -@ 1D IN SOA @ root ( - 42 ; serial (d. adams) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum - - 1D IN NS @ - 1D IN A 127.0.0.1 diff --git a/resources/chaosknoten/auth-dns/zones/old-old/ccc.zone b/resources/chaosknoten/auth-dns/zones/old-old/ccc.zone deleted file mode 100644 index cd64c12..0000000 --- a/resources/chaosknoten/auth-dns/zones/old-old/ccc.zone +++ /dev/null @@ -1,61 +0,0 @@ -$ORIGIN ccc. -$TTL 7200 -@ IN SOA turing.hamburg.ccc.de. haegar.ccc.de. ( - 2002101507 - 10800 - 3600 - 3600000 - 86400 ) - - IN NS turing.hamburg.ccc.de. - -localhost IN A 127.0.0.1 - -www IN A 195.21.255.248 - -hh IN NS ccchh.hh.ccc. - IN NS turing.hamburg.ccc.de. -ccchh.hh IN A 192.168.16.2 - -vpn.hh IN NS turing.hamburg.ccc.de. - -; haegar: -sdinet IN NS ns.sdinet.ccc. -ns.sdinet IN A 192.168.18.41 - -; falk: -valhalla IN NS thor.valhalla.ccc. -thor.valhalla IN A 192.168.21.1 - -; jeedi: -ghetto IN NS semaphore.ghetto.ccc. -semaphore.ghetto IN A 192.168.20.2 - -; count -flatline IN NS aleph.flatline.de. -flatline IN NS pulse.flatline.de. - -; thalunil (Alex Bihlmaier) -core.kallisti IN A 194.122.183.51 -fnord IN NS core.kallisti -kallisti IN NS core.kallisti - -; sz -vogsphere IN A 212.12.48.51 -datenknoten IN A 212.12.48.49 -znet IN NS datenknoten.ccc. -sz IN NS datenknoten.ccc. -chaos IN NS datenknoten.ccc. -funk IN NS datenknoten.ccc. -presse IN NS datenknoten.ccc. -weltregierung IN NS datenknoten.ccc. - -; migri -migri IN CNAME migri.homeip.net. - -; Enno -enno IN CNAME home.verbrennung.org. - -; Dennis -desc IN NS freya.ainex.net. - diff --git a/resources/chaosknoten/auth-dns/zones/old-old/vpn.hh.ccc.zone b/resources/chaosknoten/auth-dns/zones/old-old/vpn.hh.ccc.zone deleted file mode 100644 index cc76768..0000000 --- a/resources/chaosknoten/auth-dns/zones/old-old/vpn.hh.ccc.zone +++ /dev/null @@ -1,37 +0,0 @@ -$ORIGIN vpn.hh.ccc. -$TTL 7200 - -@ IN SOA vpn.hh.ccc. haegar.ccc.de. ( - 2002101502 - 10800 - 3600 - 3600000 - 86400 ) - - IN NS turing.hamburg.ccc.de. - -localhost IN A 127.0.0.1 - -network IN A 192.168.0.64 -fwhh IN A 192.168.0.65 -worf IN A 192.168.0.66 -sdinet-cut IN A 192.168.0.67 -migri IN A 192.168.0.68 -cemil IN A 192.168.0.69 -fw IN A 192.168.0.70 -fw-server IN A 192.168.0.71 - -broadcast IN A 192.168.0.127 - -net.znet IN A 192.168.23.0 -gate.znet IN A 192.168.23.23 -bc.znet IN A 192.168.23.255 - -net.no-maam IN A 192.168.24.0 -gate.no-maam IN A 192.168.24.1 -bc.no-maam IN A 192.168.24.255 - -net.loom IN A 192.168.33.0 -gate.loom IN A 192.168.33.1 -bc.loom IN A 192.168.33.255 -