From 4ac8db230ded88a3ed95ff48332a581c6cca81b2 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 18 Sep 2022 22:33:20 +0200 Subject: [PATCH] leoncloud: move from serv to pub --- config/net/pub.nix | 19 ++++++++++++++----- config/net/serv.nix | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/config/net/pub.nix b/config/net/pub.nix index 82c6f92..6801f8a 100644 --- a/config/net/pub.nix +++ b/config/net/pub.nix @@ -1,19 +1,28 @@ { site.net.pub = { dhcp = { - end = "172.20.79.254"; + start = "172.20.78.2"; + end = "172.20.79.253"; max-time = 3600; router = "pub-gw.pub"; server = "pub-gw"; - start = "172.20.78.2"; time = 300; }; domainName = "pub.zentralwerk.org"; dynamicDomain = true; - hosts4 = { pub-gw = "172.20.78.1"; }; + hosts4 = { + pub-gw = "172.20.78.1"; + leoncloud = "172.20.78.254"; + }; hosts6 = { - dn42.pub-gw = "fd23:42:c3d2:583::1"; - flpk.pub-gw = "2a0f:5382:acab:1403::1"; + dn42 = { + pub-gw = "fd23:42:c3d2:583::1"; + leoncloud = "fd23:42:c3d2:583::le01"; + }; + flpk = { + pub-gw = "2a0f:5382:acab:1403::1"; + leoncloud = "2a0f:5382:acab:1403::le01"; + }; }; subnet4 = "172.20.78.0/23"; subnets6 = { diff --git a/config/net/serv.nix b/config/net/serv.nix index c8df2e2..06258f2 100644 --- a/config/net/serv.nix +++ b/config/net/serv.nix @@ -53,7 +53,7 @@ # unused = "172.20.73.47"; minetest = "172.20.73.48"; hydra = "172.20.73.49"; - leoncloud = "172.20.73.50"; + # unused = "172.20.73.50"; nfsroot = "172.20.73.51"; ticker = "172.20.73.52"; gitea = "172.20.73.53";