From e451957df30f11fc872a1b5a741b6f725785fac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= Date: Tue, 12 Mar 2024 19:44:41 +0100 Subject: [PATCH] Start changing ns stuff to home.2rjus.net --- services/ns/master-authorative.nix | 6 +++--- services/ns/resolver.nix | 6 +++--- services/ns/secondary-authorative.nix | 6 +++--- ...-test-2rjus-net.conf => zones-home-2rjus-net.conf} | 11 ++++++----- 4 files changed, 15 insertions(+), 14 deletions(-) rename services/ns/{zones-test-2rjus-net.conf => zones-home-2rjus-net.conf} (79%) diff --git a/services/ns/master-authorative.nix b/services/ns/master-authorative.nix index b423719..979f771 100644 --- a/services/ns/master-authorative.nix +++ b/services/ns/master-authorative.nix @@ -12,7 +12,7 @@ port = 8053; ipv6 = false; verbosity = 2; - identity = "test.2rjus.net server"; + identity = "home.2rjus.net server"; interfaces = [ "0.0.0.0" ]; keys = { @@ -23,10 +23,10 @@ }; zones = { - "test.2rjus.net" = { + "home.2rjus.net" = { provideXFR = [ "10.69.13.8 xferkey" ]; notify = [ "10.69.13.8@8053 xferkey" ]; - data = builtins.readFile ./zones-test-2rjus-net.conf; + data = builtins.readFile ./zones-home-2rjus-net.conf; }; }; }; diff --git a/services/ns/resolver.nix b/services/ns/resolver.nix index 25d9e5c..2984da1 100644 --- a/services/ns/resolver.nix +++ b/services/ns/resolver.nix @@ -14,8 +14,8 @@ "127.0.0.0/8 allow" "0.0.0.0/0 allow" ]; - local-zone = "test.2rjus.net nodefault"; - domain-insecure = "test.2rjus.net"; + local-zone = "home.2rjus.net nodefault"; + domain-insecure = "home.2rjus.net"; interface = "0.0.0.0"; do-not-query-localhost = "no"; port = "53"; @@ -25,7 +25,7 @@ do-tcp = "yes"; }; stub-zone = { - name = "test.2rjus.net"; + name = "home.2rjus.net"; stub-addr = "127.0.0.1@8053"; }; forward-zone = { diff --git a/services/ns/secondary-authorative.nix b/services/ns/secondary-authorative.nix index 407145d..8bf3a2e 100644 --- a/services/ns/secondary-authorative.nix +++ b/services/ns/secondary-authorative.nix @@ -10,7 +10,7 @@ port = 8053; ipv6 = false; verbosity = 2; - identity = "test.2rjus.net server"; + identity = "home.2rjus.net server"; interfaces = [ "0.0.0.0" ]; keys = { @@ -21,10 +21,10 @@ }; zones = { - "test.2rjus.net" = { + "home.2rjus.net" = { allowNotify = [ "10.69.13.7 xferkey" ]; requestXFR = [ "AXFR 10.69.13.7@8053 xferkey" ]; - data = builtins.readFile ./zones-test-2rjus-net.conf; + data = builtins.readFile ./zones-home-2rjus-net.conf; }; }; }; diff --git a/services/ns/zones-test-2rjus-net.conf b/services/ns/zones-home-2rjus-net.conf similarity index 79% rename from services/ns/zones-test-2rjus-net.conf rename to services/ns/zones-home-2rjus-net.conf index 60f964f..55f98eb 100644 --- a/services/ns/zones-test-2rjus-net.conf +++ b/services/ns/zones-home-2rjus-net.conf @@ -1,6 +1,6 @@ -$ORIGIN test.2rjus.net. +$ORIGIN home.2rjus.net. $TTL 1800 -@ IN SOA ns1.test.2rjus.net. admin.test.2rjus.net. ( +@ IN SOA ns1.home.2rjus.net. admin.test.2rjus.net. ( 2024 ; serial number 3600 ; refresh 900 ; retry @@ -8,9 +8,9 @@ $TTL 1800 120 ; ttl ) - IN NS ns1.test.2rjus.net. - IN NS ns2.test.2rjus.net. - IN NS ns3.test.2rjus.net. + IN NS ns1.home.2rjus.net. + IN NS ns2.home.2rjus.net. + IN NS ns3.home.2rjus.net. ; 10 gw IN A 10.69.10.1 ; 12_CORE @@ -27,6 +27,7 @@ mpnzb IN A 10.69.12.57 ns1 IN A 10.69.13.5 ns2 IN A 10.69.13.6 ns3 IN A 10.69.13.7 +ns4 IN A 10.69.13.8 ; 22_WLAN unifi-ctrl IN A 10.69.22.5