winzlieb/network
winzlieb
/
network
forked from zentralwerk/network
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switch domainNames from zentralwerk.dn42 to zentralwerk.org

This commit is contained in:
Astro 2021-09-16 19:16:21 +02:00
parent e4a5aee0e4
commit df0bca25bb
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix/lib/dns.nix
View File

@ -179,15 +179,15 @@ rec {
name = "${net}.zentralwerk.dn42"; name = "${net}.zentralwerk.dn42";
ns = internalNS; ns = internalNS;
records = records =
hosts4Records hosts4 ++
lib.optionals (hosts6 ? dn42) (hosts6Records hosts6.dn42); lib.optionals (hosts6 ? dn42) (hosts6Records hosts6.dn42);
dynamic = dynamicDomain;
} }
{ {
name = "${net}.zentralwerk.org"; name = "${net}.zentralwerk.org";
ns = publicNS; ns = publicNS;
records = records =
hosts4Records hosts4 ++
lib.optionals (hosts6 ? up4) (hosts6Records hosts6.up4); lib.optionals (hosts6 ? up4) (hosts6Records hosts6.up4);
dynamic = dynamicDomain;
} }
]) namedNets ]) namedNets
) )

86
salt-pillar/dhcp/init.sls
View File

@ -10,7 +10,7 @@ dhcp:
host-opts: host-opts:
routers: pub-gw.pub routers: pub-gw.pub
string-opts: string-opts:
domain-name: pub.zentralwerk.dn42 domain-name: pub.zentralwerk.org
priv1: priv1:
start: 172.20.74.2 start: 172.20.74.2
@ -22,7 +22,7 @@ dhcp:
host-opts: host-opts:
routers: priv1-gw.priv1 routers: priv1-gw.priv1
string-opts: string-opts:
domain-name: priv1.zentralwerk.dn42 domain-name: priv1.zentralwerk.org
priv2: priv2:
start: 172.20.75.2 start: 172.20.75.2
@ -34,7 +34,7 @@ dhcp:
host-opts: host-opts:
routers: priv2-gw.priv2 routers: priv2-gw.priv2
string-opts: string-opts:
domain-name: priv2.zentralwerk.dn42 domain-name: priv2.zentralwerk.org
fixed-hosts: fixed-hosts:
172.20.75.7: 60:33:4b:0b:cd:fc 172.20.75.7: 60:33:4b:0b:cd:fc
172.20.75.9: 00:11:32:22:95:79 172.20.75.9: 00:11:32:22:95:79
@ -49,7 +49,7 @@ dhcp:
host-opts: host-opts:
routers: priv3-gw.priv3 routers: priv3-gw.priv3
string-opts: string-opts:
domain-name: priv3.zentralwerk.dn42 domain-name: priv3.zentralwerk.org
priv4: priv4:
start: 172.20.75.130 start: 172.20.75.130
@ -61,7 +61,7 @@ dhcp:
host-opts: host-opts:
routers: priv4-gw.priv4 routers: priv4-gw.priv4
string-opts: string-opts:
domain-name: priv4.zentralwerk.dn42 domain-name: priv4.zentralwerk.org
priv5: priv5:
start: 172.20.74.66 start: 172.20.74.66
@ -73,7 +73,7 @@ dhcp:
host-opts: host-opts:
routers: priv5-gw.priv5 routers: priv5-gw.priv5
string-opts: string-opts:
domain-name: priv5.zentralwerk.dn42 domain-name: priv5.zentralwerk.org
priv6: priv6:
start: 172.20.74.194 start: 172.20.74.194
@ -85,7 +85,7 @@ dhcp:
host-opts: host-opts:
routers: priv6-gw.priv6 routers: priv6-gw.priv6
string-opts: string-opts:
domain-name: priv6.zentralwerk.dn42 domain-name: priv6.zentralwerk.org
priv7: priv7:
start: 172.20.75.66 start: 172.20.75.66
@ -97,7 +97,7 @@ dhcp:
host-opts: host-opts:
routers: priv7-gw.priv7 routers: priv7-gw.priv7
string-opts: string-opts:
domain-name: priv7.zentralwerk.dn42 domain-name: priv7.zentralwerk.org
priv8: priv8:
start: 172.20.75.194 start: 172.20.75.194
@ -109,7 +109,7 @@ dhcp:
host-opts: host-opts:
routers: priv8-gw.priv8 routers: priv8-gw.priv8
string-opts: string-opts:
domain-name: priv8.zentralwerk.dn42 domain-name: priv8.zentralwerk.org
priv9: priv9:
start: 172.20.74.34 start: 172.20.74.34
@ -121,7 +121,7 @@ dhcp:
host-opts: host-opts:
routers: priv9-gw.priv9 routers: priv9-gw.priv9
string-opts: string-opts:
domain-name: priv9.zentralwerk.dn42 domain-name: priv9.zentralwerk.org
priv10: priv10:
start: 172.20.74.98 start: 172.20.74.98
@ -133,7 +133,7 @@ dhcp:
host-opts: host-opts:
routers: priv10-gw.priv10 routers: priv10-gw.priv10
string-opts: string-opts:
domain-name: priv10.zentralwerk.dn42 domain-name: priv10.zentralwerk.org
priv11: priv11:
start: 172.20.74.162 start: 172.20.74.162
@ -145,7 +145,7 @@ dhcp:
host-opts: host-opts:
routers: priv11-gw.priv11 routers: priv11-gw.priv11
string-opts: string-opts:
domain-name: priv11.zentralwerk.dn42 domain-name: priv11.zentralwerk.org
priv12: priv12:
start: 172.20.74.226 start: 172.20.74.226
@ -157,7 +157,7 @@ dhcp:
host-opts: host-opts:
routers: priv12-gw.priv12 routers: priv12-gw.priv12
string-opts: string-opts:
domain-name: priv12.zentralwerk.dn42 domain-name: priv12.zentralwerk.org
priv13: priv13:
start: 172.20.75.34 start: 172.20.75.34
@ -169,7 +169,7 @@ dhcp:
host-opts: host-opts:
routers: priv13-gw.priv13 routers: priv13-gw.priv13
string-opts: string-opts:
domain-name: priv13.zentralwerk.dn42 domain-name: priv13.zentralwerk.org
priv14: priv14:
start: 172.20.75.98 start: 172.20.75.98
@ -181,7 +181,7 @@ dhcp:
host-opts: host-opts:
routers: priv14-gw.priv14 routers: priv14-gw.priv14
string-opts: string-opts:
domain-name: priv14.zentralwerk.dn42 domain-name: priv14.zentralwerk.org
priv15: priv15:
start: 172.20.75.162 start: 172.20.75.162
@ -193,7 +193,7 @@ dhcp:
host-opts: host-opts:
routers: priv15-gw.priv15 routers: priv15-gw.priv15
string-opts: string-opts:
domain-name: priv15.zentralwerk.dn42 domain-name: priv15.zentralwerk.org
priv16: priv16:
start: 172.20.75.226 start: 172.20.75.226
@ -205,7 +205,7 @@ dhcp:
host-opts: host-opts:
routers: priv16-gw.priv16 routers: priv16-gw.priv16
string-opts: string-opts:
domain-name: priv16.zentralwerk.dn42 domain-name: priv16.zentralwerk.org
priv17: priv17:
start: 172.20.73.131 start: 172.20.73.131
@ -217,7 +217,7 @@ dhcp:
host-opts: host-opts:
routers: priv17-gw.priv17 routers: priv17-gw.priv17
string-opts: string-opts:
domain-name: priv17.zentralwerk.dn42 domain-name: priv17.zentralwerk.org
priv18: priv18:
start: 172.20.74.50 start: 172.20.74.50
@ -229,7 +229,7 @@ dhcp:
host-opts: host-opts:
routers: priv18-gw.priv18 routers: priv18-gw.priv18
string-opts: string-opts:
domain-name: priv18.zentralwerk.dn42 domain-name: priv18.zentralwerk.org
priv19: priv19:
start: 172.20.73.194 start: 172.20.73.194
@ -242,7 +242,7 @@ dhcp:
host-opts: host-opts:
routers: priv19-gw.priv19 routers: priv19-gw.priv19
string-opts: string-opts:
domain-name: priv19.zentralwerk.dn42 domain-name: priv19.zentralwerk.org
priv20: priv20:
start: 172.20.74.114 start: 172.20.74.114
@ -254,7 +254,7 @@ dhcp:
host-opts: host-opts:
routers: priv20-gw.priv20 routers: priv20-gw.priv20
string-opts: string-opts:
domain-name: priv20.zentralwerk.dn42 domain-name: priv20.zentralwerk.org
priv21: priv21:
start: 172.20.74.146 start: 172.20.74.146
@ -266,7 +266,7 @@ dhcp:
host-opts: host-opts:
routers: priv21-gw.priv21 routers: priv21-gw.priv21
string-opts: string-opts:
domain-name: priv21.zentralwerk.dn42 domain-name: priv21.zentralwerk.org
priv22: priv22:
start: 172.20.74.178 start: 172.20.74.178
@ -278,7 +278,7 @@ dhcp:
host-opts: host-opts:
routers: priv22-gw.priv22 routers: priv22-gw.priv22
string-opts: string-opts:
domain-name: priv22.zentralwerk.dn42 domain-name: priv22.zentralwerk.org
priv23: priv23:
start: 172.20.73.165 start: 172.20.73.165
@ -290,7 +290,7 @@ dhcp:
host-opts: host-opts:
routers: priv23-gw.priv23 routers: priv23-gw.priv23
string-opts: string-opts:
domain-name: priv23.zentralwerk.dn42 domain-name: priv23.zentralwerk.org
fixed-hosts: fixed-hosts:
172.20.73.162: da:2c:3a:2c:87:22 172.20.73.162: da:2c:3a:2c:87:22
172.20.73.163: ca:9f:27:b2:bf:6d 172.20.73.163: ca:9f:27:b2:bf:6d
@ -306,7 +306,7 @@ dhcp:
host-opts: host-opts:
routers: priv24-gw.priv24 routers: priv24-gw.priv24
string-opts: string-opts:
domain-name: priv24.zentralwerk.dn42 domain-name: priv24.zentralwerk.org
priv25: priv25:
start: 172.20.74.82 start: 172.20.74.82
@ -318,7 +318,7 @@ dhcp:
host-opts: host-opts:
routers: priv25-gw.priv25 routers: priv25-gw.priv25
string-opts: string-opts:
domain-name: priv25.zentralwerk.dn42 domain-name: priv25.zentralwerk.org
priv26: priv26:
start: 172.20.75.50 start: 172.20.75.50
@ -330,7 +330,7 @@ dhcp:
host-opts: host-opts:
routers: priv26-gw.priv26 routers: priv26-gw.priv26
string-opts: string-opts:
domain-name: priv26.zentralwerk.dn42 domain-name: priv26.zentralwerk.org
priv27: priv27:
start: 172.20.75.82 start: 172.20.75.82
@ -342,7 +342,7 @@ dhcp:
host-opts: host-opts:
routers: priv27-gw.priv27 routers: priv27-gw.priv27
string-opts: string-opts:
domain-name: priv27.zentralwerk.dn42 domain-name: priv27.zentralwerk.org
priv28: priv28:
start: 172.20.75.114 start: 172.20.75.114
@ -354,7 +354,7 @@ dhcp:
host-opts: host-opts:
routers: priv28-gw.priv28 routers: priv28-gw.priv28
string-opts: string-opts:
domain-name: priv28.zentralwerk.dn42 domain-name: priv28.zentralwerk.org
priv29: priv29:
start: 172.20.75.146 start: 172.20.75.146
@ -366,7 +366,7 @@ dhcp:
host-opts: host-opts:
routers: priv29-gw.priv29 routers: priv29-gw.priv29
string-opts: string-opts:
domain-name: priv29.zentralwerk.dn42 domain-name: priv29.zentralwerk.org
priv30: priv30:
start: 172.20.75.178 start: 172.20.75.178
@ -378,7 +378,7 @@ dhcp:
host-opts: host-opts:
routers: priv30-gw.priv30 routers: priv30-gw.priv30
string-opts: string-opts:
domain-name: priv30.zentralwerk.dn42 domain-name: priv30.zentralwerk.org
priv31: priv31:
start: 172.20.75.210 start: 172.20.75.210
@ -390,7 +390,7 @@ dhcp:
host-opts: host-opts:
routers: priv31-gw.priv31 routers: priv31-gw.priv31
string-opts: string-opts:
domain-name: priv31.zentralwerk.dn42 domain-name: priv31.zentralwerk.org
priv32: priv32:
start: 172.20.75.242 start: 172.20.75.242
@ -402,7 +402,7 @@ dhcp:
host-opts: host-opts:
routers: priv32-gw.priv32 routers: priv32-gw.priv32
string-opts: string-opts:
domain-name: priv32.zentralwerk.dn42 domain-name: priv32.zentralwerk.org
priv33: priv33:
start: 172.20.74.18 start: 172.20.74.18
@ -414,7 +414,7 @@ dhcp:
host-opts: host-opts:
routers: priv33-gw.priv33 routers: priv33-gw.priv33
string-opts: string-opts:
domain-name: priv33.zentralwerk.dn42 domain-name: priv33.zentralwerk.org
priv34: priv34:
start: 172.20.74.210 start: 172.20.74.210
@ -426,7 +426,7 @@ dhcp:
host-opts: host-opts:
routers: priv34-gw.priv34 routers: priv34-gw.priv34
string-opts: string-opts:
domain-name: priv34.zentralwerk.dn42 domain-name: priv34.zentralwerk.org
priv35: priv35:
start: 172.20.76.2 start: 172.20.76.2
@ -438,7 +438,7 @@ dhcp:
host-opts: host-opts:
routers: priv35-gw.priv35 routers: priv35-gw.priv35
string-opts: string-opts:
domain-name: priv35.zentralwerk.dn42 domain-name: priv35.zentralwerk.org
priv36: priv36:
start: 172.20.76.66 start: 172.20.76.66
@ -450,7 +450,7 @@ dhcp:
host-opts: host-opts:
routers: priv36-gw.priv36 routers: priv36-gw.priv36
string-opts: string-opts:
domain-name: priv36.zentralwerk.dn42 domain-name: priv36.zentralwerk.org
priv37: priv37:
start: 172.20.76.130 start: 172.20.76.130
@ -462,7 +462,7 @@ dhcp:
host-opts: host-opts:
routers: priv37-gw.priv37 routers: priv37-gw.priv37
string-opts: string-opts:
domain-name: priv37.zentralwerk.dn42 domain-name: priv37.zentralwerk.org
priv38: priv38:
start: 172.20.76.194 start: 172.20.76.194
@ -474,7 +474,7 @@ dhcp:
host-opts: host-opts:
routers: priv38-gw.priv38 routers: priv38-gw.priv38
string-opts: string-opts:
domain-name: priv38.zentralwerk.dn42 domain-name: priv38.zentralwerk.org
priv39: priv39:
start: 172.20.77.130 start: 172.20.77.130
@ -486,7 +486,7 @@ dhcp:
host-opts: host-opts:
routers: priv39-gw.priv39 routers: priv39-gw.priv39
string-opts: string-opts:
domain-name: priv39.zentralwerk.dn42 domain-name: priv39.zentralwerk.org
priv40: priv40:
start: 172.20.77.66 start: 172.20.77.66
@ -498,7 +498,7 @@ dhcp:
host-opts: host-opts:
routers: priv40-gw.priv40 routers: priv40-gw.priv40
string-opts: string-opts:
domain-name: priv40.zentralwerk.dn42 domain-name: priv40.zentralwerk.org
priv41: priv41:
start: 172.20.77.194 start: 172.20.77.194
@ -510,7 +510,7 @@ dhcp:
host-opts: host-opts:
routers: priv41-gw.priv41 routers: priv41-gw.priv41
string-opts: string-opts:
domain-name: priv41.zentralwerk.dn42 domain-name: priv41.zentralwerk.org
priv42: priv42:
start: 172.20.76.34 start: 172.20.76.34
@ -522,4 +522,4 @@ dhcp:
host-opts: host-opts:
routers: priv42-gw.priv42 routers: priv42-gw.priv42
string-opts: string-opts:
domain-name: priv42.zentralwerk.dn42 domain-name: priv42.zentralwerk.org