From 08f2340c344b3c475fa8e06faead4482408ac240 Mon Sep 17 00:00:00 2001 From: Markus Schmidl Date: Fri, 26 May 2023 22:15:19 +0200 Subject: [PATCH] cleanup serv ip addresses --- config/net/serv.nix | 50 ++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/config/net/serv.nix b/config/net/serv.nix index 3129bb2..e181e5e 100644 --- a/config/net/serv.nix +++ b/config/net/serv.nix @@ -7,47 +7,23 @@ serv-gw = "172.20.73.1"; dns = "172.20.73.2"; stats = "172.20.73.3"; - used02 = "172.20.73.4"; - used01 = "172.20.73.5"; - used0 = "172.20.73.6"; - used1 = "172.20.73.7"; + # tlms + tlms-elastic = "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"; - used51 = "172.20.73.13"; - used6 = "172.20.73.14"; buzzrelay = "172.20.73.15"; - used61 = "172.20.73.16"; - used7 = "172.20.73.17"; - used8 = "172.20.73.18"; - used9 = "172.20.73.19"; - ipa = "172.20.73.20"; matemat = "172.20.73.21"; - used10 = "172.20.73.22"; - used11 = "172.20.73.23"; - used12 = "172.20.73.24"; spaceapi = "172.20.73.25"; - used13 = "172.20.73.26"; mucbot = "172.20.73.27"; - used14 = "172.20.73.28"; - used15 = "172.20.73.29"; - used16 = "172.20.73.30"; - used17 = "172.20.73.31"; scrape = "172.20.73.32"; - used19 = "172.20.73.33"; - used20 = "172.20.73.34"; - used21 = "172.20.73.35"; - used22 = "172.20.73.36"; - used23 = "172.20.73.37"; + # tlms tram-borzoi = "172.20.73.38"; + # tlms borken-data-hoarder = "172.20.73.39"; matrix = "172.20.73.40"; - direkthilfe = "172.20.73.41"; + # "172.20.73.41" luulaatsch-asterisk = "172.20.73.42"; grafana = "172.20.73.43"; - tmppleroma = "172.20.73.44"; + # "172.20.73.44" public-access-proxy = "172.20.73.45"; marenz = "172.20.73.46"; network-homepage = "172.20.73.47"; @@ -62,27 +38,27 @@ mobilizon = "172.20.73.56"; radiobert = "172.20.73.57"; mail = "172.20.73.58"; - keycloak = "172.20.73.59"; + # "172.20.73.59" sdrweb = "172.20.73.60"; bind = "172.20.73.61"; blogs = "172.20.73.62"; - nix-build = "172.20.73.63"; + # "172.20.73.63" + # tlms staging-data-hoarder = "172.20.73.64"; oparl = "172.20.73.65"; hedgedoc = "172.20.73.66"; mediawiki = "172.20.73.67"; gnunet = "172.20.73.68"; + # tlms data-hoarder = "172.20.73.69"; broker = "172.20.73.70"; ftp = "172.20.73.71"; auth = "172.20.73.72"; - factorio = "172.20.73.73"; - zengel = "172.20.73.74"; + # "172.20.73.73" + # "172.20.73.74" prometheus = "172.20.73.75"; - oxigraph = "172.20.73.76"; + # "172.20.73.76" drone = "172.20.73.77"; - # !!! IMPORTANT !!! - # reuse a `used*` address from above }; ipv6Router = "serv-gw"; subnets6.dn42 = "fd23:42:c3d2:582::/64";