From 1fbc9031255c4a300f674f99353c59c3c04800ae Mon Sep 17 00:00:00 2001 From: bitwhisker Date: Sat, 20 Jun 2026 17:58:25 +0200 Subject: [PATCH] z9(group): remove all old ip references and change them to new ones --- .../chaosknoten/auth-dns/zones/ccchh.net.zone | 106 +++++++++++++++--- resources/z9/light/nginx/light.conf | 4 +- .../z9/yate/docker_compose/regexroute.conf.j2 | 2 +- resources/z9/z9-router/kea_dhcp.yaml | 25 ++++- 4 files changed, 118 insertions(+), 19 deletions(-) diff --git a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone index 2a69ea8..9151920 100644 --- a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone +++ b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone @@ -16,6 +16,8 @@ $TTL 60 ; 1 minutes ; rt-wan A 185.161.129.134 AAAA 2a07:c481::1:2 +z9-router A 10.89.213.1 + AAAA 2a07:c481:1:36::1 sw-rack-1 A 10.89.213.2 AAAA 2a07:c481:1:36::2 sw-rack-2-poe A 10.89.213.3 @@ -41,27 +43,100 @@ pve04 A 10.89.213.14 pbs A 10.89.213.15 AAAA 2a07:c481:1:36::15 unifi A 10.89.213.21 +; AAAA 2a07:c481:1:36::21 ; ; Club-Services ; -xr18 A 172.31.200.21 +xr18 A 10.89.208.15 +AtemMini A 10.89.212.234 -;club-assistant AAAA 2a07:c481:1:d0::a -;;_acme-challenge.club-assistant CNAME d50ad73a-f82d-4244-87f0-6f5195b37d21.auth.acmedns.hamburg.ccc.de -;esphome AAAA 2a07:c481:1:d0::66 -;zigbee2mqtt A 185.161.129.132 -;light AAAA 2a07:c481:1:d0::16 -;_acme-challenge.light CNAME e59f55ee-9013-469d-a146-a159721b6fea.auth.acmedns.hamburg.ccc.de. -;light-werkstatt AAAA 2a07:c481:1:d0::16 -;_acme-challenge.light-werkstatt CNAME f408acc0-d9f5-4525-bb01-28938e3bb7d0.auth.acmedns.hamburg.ccc.de. -;hmdooris-ccu A 10.31.208.202 -;buba A 10.31.211.137 -;dooris AAAA 2a07:c481:1:d0::1c -;_acme-challenge.dooris CNAME 37caae1f-b77f-4eb1-aa71-dc3f7ed24360.auth.acmedns.hamburg.ccc.de. -;yate A 10.31.208.12 -;staubiv2 A 10.31.210.233 +beamer A 10.89.208.11 +ir-bridge-beamer A 10.89.212.213 +Big-Room-Beamer A 10.89.208.14 + +prusamk3 A 10.89.212.3 +prusamk4 A 10.89.212.4 + +wled-kueche A 10.89.212.33 +wled-serverschrank A 10.89.212.34 +wled-couch A 10.89.212.35 + +laser A 10.89.212.36 +laser-eth A 10.89.212.37 + +okilaser A 10.89.212.235 + +t-mix A 10.89.212.42 +fritz-fon A 10.89.212.86 + +staubi A 10.89.212.232 +staubiv2 A 10.89.212.233 + +hp-color A 10.89.209.28 + + +club-assistant A 10.89.213.22 + AAAA 2a07:c481:1:36::32 +_acme-challenge.club-assistant CNAME d50ad73a-f82d-4244-87f0-6f5195b37d21.auth.acmedns.hamburg.ccc.de + + +esphome A 10.89.212.210 + AAAA 2a07:c481:1:34::66 +hauptraum-esphome A 10.89.212.211 +werkstatt-esphome A 10.89.212.212 + + +light A 10.89.213.28 + AAAA 2a07:c481:1:36::31 +_acme-challenge.light CNAME e59f55ee-9013-469d-a146-a159721b6fea.auth.acmedns.hamburg.ccc.de. +light-werkstatt CNAME light.ccchh.net. +_acme-challenge.light-werkstatt CNAME f408acc0-d9f5-4525-bb01-28938e3bb7d0.auth.acmedns.hamburg.ccc.de. + +pi-dmx-werkstatt A 10.89.212.215 + + +dooris A 10.89.208.16 + AAAA 2a07:c481:1:33::1c +_acme-challenge.dooris CNAME 37caae1f-b77f-4eb1-aa71-dc3f7ed24360.auth.acmedns.hamburg.ccc.de. + +hmdooris-ccu A 10.89.208.17 + +dooris-ng A 10.89.209.29 + + +buba A 10.89.212.137 + +yate A 10.89.213.24 + +muzak A 10.89.208.13 + +encoder-ccchh A 10.89.209.166 + +ki10 A 10.89.209.254 + +Ziggy A 10.89.212.11 + +legacy A 10.89.212.12 + +foobarpay A 10.89.212.23 + +foobackup A 10.89.212.24 + +ender3v2-sonic-pad A 10.89.212.27 + +octopi A 10.89.212.31 + +433mhz-bridge A 10.89.212.32 + + +;SIP-T46S A 10.89.212.227 +;SIP-T46S A 10.89.212.230 + +;cisco-slm248p A 10.89.208.27 + +;zigbee2mqtt A 185.161.129.132 ; Old entry probably deprecadet ; @@ -70,3 +145,4 @@ xr18 A 172.31.200.21 opensourcetorrents A 185.161.130.67 AAAA 2a07:c481:1:35::42 + diff --git a/resources/z9/light/nginx/light.conf b/resources/z9/light/nginx/light.conf index 8d90258..18e2a41 100644 --- a/resources/z9/light/nginx/light.conf +++ b/resources/z9/light/nginx/light.conf @@ -13,7 +13,7 @@ server { ssl_trusted_certificate /etc/letsencrypt/live/light-werkstatt.ccchh.net/chain.pem; # replace with the IP address of your resolver - resolver 10.31.208.1; + #resolver 10.31.208.1; # is this needed? location / { proxy_pass http://127.0.0.1:8081; @@ -38,7 +38,7 @@ server { ssl_trusted_certificate /etc/letsencrypt/live/light.ccchh.net/chain.pem; # replace with the IP address of your resolver - resolver 10.31.208.1; + #resolver 10.31.208.1; # is this needed? location / { proxy_pass http://127.0.0.1:8080; diff --git a/resources/z9/yate/docker_compose/regexroute.conf.j2 b/resources/z9/yate/docker_compose/regexroute.conf.j2 index aeecf6b..0f7bd96 100644 --- a/resources/z9/yate/docker_compose/regexroute.conf.j2 +++ b/resources/z9/yate/docker_compose/regexroute.conf.j2 @@ -81,7 +81,7 @@ ${called}^fo370381tr317349_00$=inbound_fonial ^.*$=echo [z9] "\0" ${caller}->${called} ; log ; test service numbers -^91$=sip/sip:ha@10.31.208.10:5060; called=ha;format=opus ; Homeassistant +^91$=sip/sip:ha@10.89.213.22:5060; called=ha;format=opus ; Homeassistant ^98$=external/playrec/echo.sh ; Echotest ^99$=external/play/tts.sh;mode=text;text=Hallo Hallo Hallo ; TTS test diff --git a/resources/z9/z9-router/kea_dhcp.yaml b/resources/z9/z9-router/kea_dhcp.yaml index d191881..8b9b9fb 100644 --- a/resources/z9/z9-router/kea_dhcp.yaml +++ b/resources/z9/z9-router/kea_dhcp.yaml @@ -36,6 +36,9 @@ kea_dhcp__dhcp4: - ip-address: 10.89.208.14 hostname: Big-Room-Beamer hw-address: "64:d2:c4:db:08:5c" + - ip-address: 10.89.208.15 + hostname: xr18 + hw-address: "34:8d:13:13:1f:33" - ip-address: 10.89.208.16 hostname: dooris hw-address: "bc:24:11:b3:93:9c" @@ -115,9 +118,15 @@ kea_dhcp__dhcp4: - ip-address: 10.89.212.42 hostname: t-mix hw-address: "40:a5:ef:d9:eb:93" + - ip-address: 10.89.212.137 + hostname: ccchh-buba + hw-address: "b8:27:eb:29:bd:77" - ip-address: 10.89.212.86 hostname: fritz-fon hw-address: "00:1f:3f:c9:e5:b2" + - ip-address: 10.89.212.210 + hostname: esphome + hw-address: "7e:3c:f0:77:8a:f4" - ip-address: 10.89.212.211 hostname: hauptraum-esphome hw-address: "e8:db:84:e8:18:d2" @@ -246,10 +255,18 @@ kea_dhcp__dhcp6: subnet: "2a07:c481:1:33::/64" pools: - pool: "2a07:c481:1:33::1:1 - 2a07:c481:1:33::FFFF:FFFF" + reservations: + - ip-address: "2a07:c481:1:33::1c" + hostname: dooris + hw-address: "bc:24:11:b3:93:9c" - id: 2 subnet: "2a07:c481:1:34::/64" pools: - pool: "2a07:c481:1:34::1:1 - 2a07:c481:1:34::FFFF:FFFF" + reservations: + - ip-address: "2a07:c481:1:34::66" + hostname: esphome + hw-address: "7e:3c:f0:77:8a:f4" - id: 3 subnet: "2a07:c481:1:36::/64" pools: @@ -288,6 +305,12 @@ kea_dhcp__dhcp6: - ip-address: "2a07:c481:1:36::f" hostname: pbs hw-address: "BC:24:11:D6:2C:81" - - ip-address: "2a07:c481:1:36::14" + - ip-address: "2a07:c481:1:36::21" hostname: unifi hw-address: "BC:24:11:25:77:60" + - ip-address: "2a07:c481:1:36::31" + hostname: light + hw-address: "72:61:ea:e6:49:e3" + - ip-address: "2a07:c481:1:36::32" + hostname: club-assistant + hw-address: "7a:55:61:c3:a2:89"