summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-03-15 17:55:00 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2022-03-15 17:55:00 +0100
commitf95928a0ba0bdd5d66bae0ead8d64d78c73e6057 (patch)
tree3d80111310f1b07d0757ba0272ab90acc61bc0a9
parenta800fbfe7360557832ad0196ecf20417faedefab (diff)
downloadnixos-f95928a0ba0bdd5d66bae0ead8d64d78c73e6057.tar
nixos-f95928a0ba0bdd5d66bae0ead8d64d78c73e6057.tar.gz
nixos-f95928a0ba0bdd5d66bae0ead8d64d78c73e6057.tar.bz2
nixos-f95928a0ba0bdd5d66bae0ead8d64d78c73e6057.tar.xz
nixos-f95928a0ba0bdd5d66bae0ead8d64d78c73e6057.zip
vidhar: ...
Diffstat
-rw-r--r--hosts/vidhar/dns/default.nix13
-rw-r--r--hosts/vidhar/dns/zones/arpa.in-addr.10.141.0.soa12
-rw-r--r--hosts/vidhar/dns/zones/arpa.in-addr.10.141.1.soa14
-rw-r--r--hosts/vidhar/dns/zones/arpa.in-addr.10.141.soa8
-rw-r--r--hosts/vidhar/dns/zones/yggdrasil.lan.soa13
-rw-r--r--hosts/vidhar/dns/zones/yggdrasil.mgmt.soa15
-rw-r--r--hosts/vidhar/dns/zones/yggdrasil.soa5
-rw-r--r--hosts/vidhar/network/dhcp/default.nix20
8 files changed, 14 insertions, 86 deletions
diff --git a/hosts/vidhar/dns/default.nix b/hosts/vidhar/dns/default.nix
index b9c6433f..b1457a7a 100644
--- a/hosts/vidhar/dns/default.nix
+++ b/hosts/vidhar/dns/default.nix
@@ -53,6 +53,7 @@ in {
53 rrset-roundrobin = true; 53 rrset-roundrobin = true;
54 use-caps-for-id = true; 54 use-caps-for-id = true;
55 55
56 do-not-query-localhost = false;
56 local-zone = [ 57 local-zone = [
57 "141.10.in-addr.arpa. transparent" 58 "141.10.in-addr.arpa. transparent"
58 "yggdrasil. transparent" 59 "yggdrasil. transparent"
@@ -100,21 +101,9 @@ in {
100 - domain: yggdrasil 101 - domain: yggdrasil
101 template: local_zone 102 template: local_zone
102 file: ${./zones/yggdrasil.soa} 103 file: ${./zones/yggdrasil.soa}
103 - domain: lan.yggdrasil
104 template: local_zone
105 file: ${./zones/yggdrasil.lan.soa}
106 - domain: mgmt.yggdrasil
107 template: local_zone
108 file: ${./zones/yggdrasil.mgmt.soa}
109 - domain: 141.10.in-addr.arpa 104 - domain: 141.10.in-addr.arpa
110 template: local_zone 105 template: local_zone
111 file: ${./zones/arpa.in-addr.10.141.soa} 106 file: ${./zones/arpa.in-addr.10.141.soa}
112 - domain: 0.141.10.in-addr.arpa
113 template: local_zone
114 file: ${./zones/arpa.in-addr.10.141.0.soa}
115 - domain: 1.141.10.in-addr.arpa
116 template: local_zone
117 file: ${./zones/arpa.in-addr.10.141.1.soa}
118 ''; 107 '';
119 }; 108 };
120 109
diff --git a/hosts/vidhar/dns/zones/arpa.in-addr.10.141.0.soa b/hosts/vidhar/dns/zones/arpa.in-addr.10.141.0.soa
deleted file mode 100644
index 75e6b3a8..00000000
--- a/hosts/vidhar/dns/zones/arpa.in-addr.10.141.0.soa
+++ /dev/null
@@ -1,12 +0,0 @@
1$ORIGIN 0.141.10.in-addr.arpa.
2$TTL 300
3@ IN SOA vidhar.lan.yggdrasil. root.yggdrasil.li. (
4 2022031504 ; serial
5 300 ; refresh
6 300 ; retry
7 300 ; expire
8 300 ; min TTL
9)
10
11 IN NS vidhar.lan.yggdrasil.
121 IN PTR vidhar.lan.yggdrasil.
diff --git a/hosts/vidhar/dns/zones/arpa.in-addr.10.141.1.soa b/hosts/vidhar/dns/zones/arpa.in-addr.10.141.1.soa
deleted file mode 100644
index 2d535d56..00000000
--- a/hosts/vidhar/dns/zones/arpa.in-addr.10.141.1.soa
+++ /dev/null
@@ -1,14 +0,0 @@
1$ORIGIN 1.141.10.in-addr.arpa.
2$TTL 300
3@ IN SOA vidhar.mgmt.yggdrasil. root.yggdrasil.li. (
4 2022031505 ; serial
5 300 ; refresh
6 300 ; retry
7 300 ; expire
8 300 ; min TTL
9)
10
11 IN NS vidhar.mgmt.yggdrasil.
121 IN PTR vidhar.mgmt.yggdrasil.
132 IN PTR switch01.mgmt.yggdrasil.
144 IN PTR ap01.mgmt.yggdrasil.
diff --git a/hosts/vidhar/dns/zones/arpa.in-addr.10.141.soa b/hosts/vidhar/dns/zones/arpa.in-addr.10.141.soa
index ea5a35f3..9dcb50dc 100644
--- a/hosts/vidhar/dns/zones/arpa.in-addr.10.141.soa
+++ b/hosts/vidhar/dns/zones/arpa.in-addr.10.141.soa
@@ -1,7 +1,7 @@
1$ORIGIN 141.10.in-addr.arpa. 1$ORIGIN 141.10.in-addr.arpa.
2$TTL 300 2$TTL 300
3@ IN SOA vidhar.lan.yggdrasil. root.yggdrasil.li. ( 3@ IN SOA vidhar.lan.yggdrasil. root.yggdrasil.li. (
4 2022031505 ; serial 4 2022031506 ; serial
5 300 ; refresh 5 300 ; refresh
6 300 ; retry 6 300 ; retry
7 300 ; expire 7 300 ; expire
@@ -9,3 +9,9 @@ $TTL 300
9) 9)
10 10
11 IN NS vidhar.lan.yggdrasil. 11 IN NS vidhar.lan.yggdrasil.
12
131.0 IN PTR vidhar.lan.yggdrasil.
14
151.1 IN PTR vidhar.mgmt.yggdrasil.
162.1 IN PTR switch01.mgmt.yggdrasil.
174.1 IN PTR ap01.mgmt.yggdrasil.
diff --git a/hosts/vidhar/dns/zones/yggdrasil.lan.soa b/hosts/vidhar/dns/zones/yggdrasil.lan.soa
deleted file mode 100644
index c58b9a13..00000000
--- a/hosts/vidhar/dns/zones/yggdrasil.lan.soa
+++ /dev/null
@@ -1,13 +0,0 @@
1$ORIGIN lan.yggdrasil.
2$TTL 300
3@ IN SOA vidhar.lan.yggdrasil. root.yggdrasil.li. (
4 2022031504 ; serial
5 300 ; refresh
6 300 ; retry
7 300 ; expire
8 300 ; min TTL
9)
10
11 IN NS vidhar.lan.yggdrasil.
12
13vidhar IN A 10.141.0.1
diff --git a/hosts/vidhar/dns/zones/yggdrasil.mgmt.soa b/hosts/vidhar/dns/zones/yggdrasil.mgmt.soa
deleted file mode 100644
index 8a630a9a..00000000
--- a/hosts/vidhar/dns/zones/yggdrasil.mgmt.soa
+++ /dev/null
@@ -1,15 +0,0 @@
1$ORIGIN mgmt.yggdrasil.
2$TTL 300
3@ IN SOA vidhar.mgmt.yggdrasil. root.yggdrasil.li. (
4 2022031505 ; serial
5 300 ; refresh
6 300 ; retry
7 300 ; expire
8 300 ; min TTL
9)
10
11 IN NS vidhar.mgmt.yggdrasil.
12
13vidhar IN A 10.141.1.1
14switch01 IN A 10.141.1.2
15ap01 IN A 10.141.1.4
diff --git a/hosts/vidhar/dns/zones/yggdrasil.soa b/hosts/vidhar/dns/zones/yggdrasil.soa
index 6e66a063..c56e80e0 100644
--- a/hosts/vidhar/dns/zones/yggdrasil.soa
+++ b/hosts/vidhar/dns/zones/yggdrasil.soa
@@ -1,7 +1,7 @@
1$ORIGIN yggdrasil. 1$ORIGIN yggdrasil.
2$TTL 300 2$TTL 300
3@ IN SOA vidhar.yggdrasil. root.yggdrasil.li. ( 3@ IN SOA vidhar.yggdrasil. root.yggdrasil.li. (
4 2022031504 ; serial 4 2022031505 ; serial
5 300 ; refresh 5 300 ; refresh
6 300 ; retry 6 300 ; retry
7 300 ; expire 7 300 ; expire
@@ -18,4 +18,7 @@ grafana.vidhar IN CNAME vidhar.yggdrasil.
18 18
19 19
20vidhar.lan IN A 10.141.0.1 20vidhar.lan IN A 10.141.0.1
21
21vidhar.mgmt IN A 10.141.1.1 22vidhar.mgmt IN A 10.141.1.1
23switch01.mgmt IN A 10.141.1.2
24ap01.mgmt IN A 10.141.1.4
diff --git a/hosts/vidhar/network/dhcp/default.nix b/hosts/vidhar/network/dhcp/default.nix
index ccc22c7f..b007b773 100644
--- a/hosts/vidhar/network/dhcp/default.nix
+++ b/hosts/vidhar/network/dhcp/default.nix
@@ -165,15 +165,7 @@
165 settings = { 165 settings = {
166 forward-ddns = { 166 forward-ddns = {
167 ddns-domains = [ 167 ddns-domains = [
168 { name = "lan.yggdrasil."; 168 { name = "yggdrasil.";
169 dns-servers = [
170 { ip-address = "127.0.0.1";
171 port = 5353;
172 key-name = "local_key";
173 }
174 ];
175 }
176 { name = "mgmt.yggdrasil.";
177 dns-servers = [ 169 dns-servers = [
178 { ip-address = "127.0.0.1"; 170 { ip-address = "127.0.0.1";
179 port = 5353; 171 port = 5353;
@@ -185,15 +177,7 @@
185 }; 177 };
186 reverse-ddns = { 178 reverse-ddns = {
187 ddns-domains = [ 179 ddns-domains = [
188 { name = "0.141.10.in-addr.arpa."; 180 { name = "141.10.in-addr.arpa.";
189 dns-servers = [
190 { ip-address = "127.0.0.1";
191 port = 5353;
192 key-name = "local_key";
193 }
194 ];
195 }
196 { name = "1.141.10.in-addr.arpa.";
197 dns-servers = [ 181 dns-servers = [
198 { ip-address = "127.0.0.1"; 182 { ip-address = "127.0.0.1";
199 port = 5353; 183 port = 5353;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 03:00:24 +0000