diff --git a/systems/x86_64-linux/prefect/dn42/bgp.nix b/systems/x86_64-linux/prefect/dn42/bgp.nix index d3298143..97bab669 100644 --- a/systems/x86_64-linux/prefect/dn42/bgp.nix +++ b/systems/x86_64-linux/prefect/dn42/bgp.nix @@ -36,7 +36,7 @@ _: { multihop = false; gracefulRestart = true; name = "sunnet"; - neigh = "fe80::3088:194%wg42_sunnet"; + neigh = "fe80::3088:193%wg42_sunnet"; as = "4242423088"; link = "3"; } diff --git a/systems/x86_64-linux/prefect/dn42/services.nix b/systems/x86_64-linux/prefect/dn42/services.nix index b696d399..468c9d77 100644 --- a/systems/x86_64-linux/prefect/dn42/services.nix +++ b/systems/x86_64-linux/prefect/dn42/services.nix @@ -35,33 +35,9 @@ in }; }; }; - services.bird-lg-proxy.serviceConfig.User = lib.mkForce "bird2"; - services.bird-lg-proxy.serviceConfig.Group = lib.mkForce "bird2"; }; services = { - bird-lg = { - proxy = { - enable = true; - listenAddress = "0.0.0.0:8000"; - birdSocket = "/var/run/bird/bird.ctl"; - # allowedIPs = ["0.0.0.0/0"]; - }; - frontend = { - enable = true; - domain = "thehedgehog.me"; - dnsInterface = "asn.lantian.dn42"; - listenAddress = "0.0.0.0:6920"; - netSpecificMode = "dn42"; - # protocolFilter = ["bgp" "ospf" "static"]; - proxyPort = 8000; - servers = [ "dn42" ]; - whois = "whois.burble.dn42"; - # titleBrand = "THEHEDGEHOG LG"; - # navbar.brand = "THEHEDGEHOG LG"; - }; - }; - bird = { enable = true; package = pkgs.bird2; diff --git a/systems/x86_64-linux/prefect/dn42/tunnels.nix b/systems/x86_64-linux/prefect/dn42/tunnels.nix index 046e065f..be0197bf 100644 --- a/systems/x86_64-linux/prefect/dn42/tunnels.nix +++ b/systems/x86_64-linux/prefect/dn42/tunnels.nix @@ -35,12 +35,12 @@ in "fe80::2189:e8"; wg42_sunnet = - tunnel 492 defaultPrivKeyFile "wAI2D+0GeBnFUqm3xZsfvVlfGQ5iDWI/BykEBbkc62c=" defaultLocalIPv4 + tunnel 492 defaultPrivKeyFile "QSAeFPotqFpF6fFe3CMrMjrpS5AL54AxWY2w1+Ot2Bo=" defaultLocalIPv4 "fe80::abcd" - "nyc1-us.dn42.6700.cc:22459" + "v6.lax1-us.dn42.6700.cc:22459" "wg42_sunnet" - "172.21.100.194" - "fe80::3088:194"; + "172.21.100.193" + "fe80::3088:193"; wg42_catgirls = tunnel 493 defaultPrivKeyFile "jo8eAfY8LeA4FAEJ4laYYMNkMd4z3oO/zN5DN0Mo+RQ=" defaultLocalIPv4 @@ -55,7 +55,7 @@ in wg42_potato = tunnel 495 defaultPrivKeyFile "LUwqKS6QrCPv510Pwt1eAIiHACYDsbMjrkrbGTJfviU=" defaultLocalIPv4 "fe80::9" - "us1.dn42.potat0.cc:22459" + "las.node.potat0.cc:22459" "wg42_potato" "" "fe80::1816";