forked from zentralwerk/network
config/serv: cleanup
This commit is contained in:
parent
81b901715a
commit
e2580e78fd
155
config/serv.nix
155
config/serv.nix
|
@ -1,52 +1,44 @@
|
||||||
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
site.net.serv = {
|
site.net.serv = {
|
||||||
domainName = "serv.zentralwerk.org";
|
domainName = "serv.zentralwerk.org";
|
||||||
|
subnet4 = "172.20.73.0/26";
|
||||||
hosts4 = {
|
hosts4 = {
|
||||||
bind = "172.20.73.61";
|
serv-gw = "172.20.73.1";
|
||||||
|
dns = "172.20.73.2";
|
||||||
|
stats = "172.20.73.3";
|
||||||
|
radius = "172.20.73.4";
|
||||||
|
zeit = "172.20.73.5";
|
||||||
|
ntp = "172.20.73.5";
|
||||||
|
minecraft = "172.20.73.6";
|
||||||
|
used1 = "172.20.73.7";
|
||||||
|
dnscache = "172.20.73.8";
|
||||||
|
used2 = "172.20.73.9";
|
||||||
|
used3 = "172.20.73.10";
|
||||||
|
used4 = "172.20.73.11";
|
||||||
|
used5 = "172.20.73.12";
|
||||||
|
logging = "172.20.73.13";
|
||||||
|
used6 = "172.20.73.14";
|
||||||
c3d2-web = "172.20.73.15";
|
c3d2-web = "172.20.73.15";
|
||||||
deployer = "172.20.73.16";
|
deployer = "172.20.73.16";
|
||||||
dns = "172.20.73.2";
|
used7 = "172.20.73.17";
|
||||||
dnscache = "172.20.73.8";
|
used8 = "172.20.73.18";
|
||||||
gitea = "172.20.73.53";
|
used9 = "172.20.73.19";
|
||||||
grafana = "172.20.73.43";
|
|
||||||
hydra = "172.20.73.49";
|
|
||||||
ipa = "172.20.73.20";
|
ipa = "172.20.73.20";
|
||||||
jabber = "172.20.73.55";
|
|
||||||
keycloak = "172.20.73.59";
|
|
||||||
kibana = "172.20.73.44";
|
|
||||||
leonos = "172.20.73.47";
|
|
||||||
logging = "172.20.73.13";
|
|
||||||
mail = "172.20.73.58";
|
|
||||||
marenz = "172.20.73.46";
|
|
||||||
matemat = "172.20.73.21";
|
matemat = "172.20.73.21";
|
||||||
minecraft = "172.20.73.6";
|
|
||||||
minetest = "172.20.73.48";
|
|
||||||
mobilizon = "172.20.73.56";
|
|
||||||
mucbot = "172.20.73.27";
|
|
||||||
netboot = "172.20.73.50";
|
|
||||||
ntp = "172.20.73.5";
|
|
||||||
public-access-proxy = "172.20.73.45";
|
|
||||||
radiobert = "172.20.73.57";
|
|
||||||
radius = "172.20.73.4";
|
|
||||||
scrape = "172.20.73.32";
|
|
||||||
sdrweb = "172.20.73.60";
|
|
||||||
serv-gw = "172.20.73.1";
|
|
||||||
spaceapi = "172.20.73.25";
|
|
||||||
stats = "172.20.73.3";
|
|
||||||
stream = "172.20.73.54";
|
|
||||||
ticker = "172.20.73.52";
|
|
||||||
used1 = "172.20.73.7";
|
|
||||||
used10 = "172.20.73.22";
|
used10 = "172.20.73.22";
|
||||||
used11 = "172.20.73.23";
|
used11 = "172.20.73.23";
|
||||||
used12 = "172.20.73.24";
|
used12 = "172.20.73.24";
|
||||||
|
spaceapi = "172.20.73.25";
|
||||||
used13 = "172.20.73.26";
|
used13 = "172.20.73.26";
|
||||||
|
mucbot = "172.20.73.27";
|
||||||
used14 = "172.20.73.28";
|
used14 = "172.20.73.28";
|
||||||
used15 = "172.20.73.29";
|
used15 = "172.20.73.29";
|
||||||
used16 = "172.20.73.30";
|
used16 = "172.20.73.30";
|
||||||
used17 = "172.20.73.31";
|
used17 = "172.20.73.31";
|
||||||
|
scrape = "172.20.73.32";
|
||||||
used18 = "172.20.73.32";
|
used18 = "172.20.73.32";
|
||||||
used19 = "172.20.73.33";
|
used19 = "172.20.73.33";
|
||||||
used2 = "172.20.73.9";
|
|
||||||
used20 = "172.20.73.34";
|
used20 = "172.20.73.34";
|
||||||
used21 = "172.20.73.35";
|
used21 = "172.20.73.35";
|
||||||
used22 = "172.20.73.36";
|
used22 = "172.20.73.36";
|
||||||
|
@ -54,18 +46,31 @@
|
||||||
used24 = "172.20.73.38";
|
used24 = "172.20.73.38";
|
||||||
used25 = "172.20.73.39";
|
used25 = "172.20.73.39";
|
||||||
used26 = "172.20.73.40";
|
used26 = "172.20.73.40";
|
||||||
used3 = "172.20.73.10";
|
# unused = "172.22.73.41";
|
||||||
used4 = "172.20.73.11";
|
# unused = "172.22.73.42";
|
||||||
used5 = "172.20.73.12";
|
grafana = "172.20.73.43";
|
||||||
used6 = "172.20.73.14";
|
kibana = "172.20.73.44";
|
||||||
used7 = "172.20.73.17";
|
public-access-proxy = "172.20.73.45";
|
||||||
used8 = "172.20.73.18";
|
marenz = "172.20.73.46";
|
||||||
used9 = "172.20.73.19";
|
leonos = "172.20.73.47";
|
||||||
|
minetest = "172.20.73.48";
|
||||||
|
hydra = "172.20.73.49";
|
||||||
|
netboot = "172.20.73.50";
|
||||||
vps1 = "172.20.73.51";
|
vps1 = "172.20.73.51";
|
||||||
zeit = "172.20.73.5";
|
ticker = "172.20.73.52";
|
||||||
|
gitea = "172.20.73.53";
|
||||||
|
stream = "172.20.73.54";
|
||||||
|
jabber = "172.20.73.55";
|
||||||
|
mobilizon = "172.20.73.56";
|
||||||
|
radiobert = "172.20.73.57";
|
||||||
|
mail = "172.20.73.58";
|
||||||
|
keycloak = "172.20.73.59";
|
||||||
|
sdrweb = "172.20.73.60";
|
||||||
|
bind = "172.20.73.61";
|
||||||
};
|
};
|
||||||
hosts6 = {
|
subnets6.dn42 = "fd23:42:c3d2:582::/64";
|
||||||
dn42 = {
|
subnets6.up4 = "2a00:8180:2c00:282::/64";
|
||||||
|
hosts6.dn42 = {
|
||||||
bind = "fd23:42:c3d2:582:cd7:56ff:fe69:6366";
|
bind = "fd23:42:c3d2:582:cd7:56ff:fe69:6366";
|
||||||
c3d2-web = "fd23:42:c3d2:582:642e:95ff:fe34:49f9";
|
c3d2-web = "fd23:42:c3d2:582:642e:95ff:fe34:49f9";
|
||||||
dns = "fd23:42:c3d2:582:2:0:0:2";
|
dns = "fd23:42:c3d2:582:2:0:0:2";
|
||||||
|
@ -87,7 +92,7 @@
|
||||||
stats = "fd23:42:c3d2:582:2:0:0:3";
|
stats = "fd23:42:c3d2:582:2:0:0:3";
|
||||||
zeit = "fd23:42:c3d2:582:2:0:0:5";
|
zeit = "fd23:42:c3d2:582:2:0:0:5";
|
||||||
};
|
};
|
||||||
up4 = {
|
hosts6.up4 = {
|
||||||
bind = "2a00:8180:2c00:282:cd7:56ff:fe69:6366";
|
bind = "2a00:8180:2c00:282:cd7:56ff:fe69:6366";
|
||||||
c3d2-web = "2a00:8180:2c00:282:642e:95ff:fe34:49f9";
|
c3d2-web = "2a00:8180:2c00:282:642e:95ff:fe34:49f9";
|
||||||
dns = "2a00:8180:2c00:282:2:0:0:2";
|
dns = "2a00:8180:2c00:282:2:0:0:2";
|
||||||
|
@ -113,75 +118,49 @@
|
||||||
zeit = "2a00:8180:2c00:282:2:0:0:5";
|
zeit = "2a00:8180:2c00:282:2:0:0:5";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
subnet4 = "172.20.73.0/26";
|
|
||||||
subnets6 = {
|
|
||||||
dn42 = "fd23:42:c3d2:582::/64";
|
|
||||||
up4 = "2a00:8180:2c00:282::/64";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
site.hosts = {
|
site.hosts =
|
||||||
dns = {
|
let
|
||||||
|
makeContainer = lib.recursiveUpdate {
|
||||||
|
role = "container";
|
||||||
interfaces = {
|
interfaces = {
|
||||||
serv = {
|
serv = {
|
||||||
gw4 = "serv-gw";
|
gw4 = "serv-gw";
|
||||||
gw6 = "serv-gw";
|
gw6 = "serv-gw";
|
||||||
hwaddr = "0A:14:48:01:23:00";
|
|
||||||
type = "veth";
|
type = "veth";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
dns = makeContainer {
|
||||||
|
interfaces.serv.hwaddr = "0A:14:48:01:23:00";
|
||||||
services.dns.enable = true;
|
services.dns.enable = true;
|
||||||
role = "container";
|
|
||||||
};
|
|
||||||
dnscache = {
|
|
||||||
interfaces = {
|
|
||||||
serv = {
|
|
||||||
gw4 = "serv-gw";
|
|
||||||
gw6 = "serv-gw";
|
|
||||||
type = "veth";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
dnscache = makeContainer {
|
||||||
services.dnscache.enable = true;
|
services.dnscache.enable = true;
|
||||||
role = "container";
|
|
||||||
};
|
};
|
||||||
netboot = {
|
netboot = makeContainer {
|
||||||
interfaces = {
|
interfaces.serv.hwaddr = "0A:14:48:01:15:01";
|
||||||
serv = {
|
|
||||||
gw4 = "serv-gw";
|
|
||||||
gw6 = "serv-gw";
|
|
||||||
hwaddr = "0A:14:48:01:15:01";
|
|
||||||
type = "veth";
|
|
||||||
};
|
};
|
||||||
};
|
serv-gw = makeContainer {
|
||||||
role = "container";
|
|
||||||
};
|
|
||||||
serv-gw = {
|
|
||||||
interfaces = {
|
interfaces = {
|
||||||
core = {
|
core = {
|
||||||
hwaddr = "0A:14:48:01:06:01";
|
|
||||||
type = "veth";
|
type = "veth";
|
||||||
|
hwaddr = "0A:14:48:01:06:01";
|
||||||
|
gw4 = null;
|
||||||
|
gw6 = null;
|
||||||
};
|
};
|
||||||
serv = {
|
serv = {
|
||||||
hwaddr = "0A:14:48:01:06:00";
|
hwaddr = "0A:14:48:01:06:00";
|
||||||
type = "veth";
|
gw4 = null;
|
||||||
|
gw6 = null;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
ospf = {
|
ospf.allowedUpstreams =
|
||||||
allowedUpstreams =
|
|
||||||
[ "upstream4" "upstream1" "upstream3" "anon1" "freifunk" ];
|
[ "upstream4" "upstream1" "upstream3" "anon1" "freifunk" ];
|
||||||
};
|
};
|
||||||
role = "container";
|
stats = makeContainer {
|
||||||
};
|
interfaces.serv.hwaddr = "0A:14:48:01:15:00";
|
||||||
stats = {
|
|
||||||
interfaces = {
|
|
||||||
serv = {
|
|
||||||
gw4 = "serv-gw";
|
|
||||||
gw6 = "serv-gw";
|
|
||||||
hwaddr = "0A:14:48:01:15:00";
|
|
||||||
type = "veth";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
role = "container";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue