feat(servers): stop using a specific WAN IP to account for IP changing
All checks were successful
Discord / discord commits (push) Successful in 36s

This commit is contained in:
matt1432 2024-08-11 16:52:00 -04:00
parent c14a7906c8
commit d3919fce27
2 changed files with 6 additions and 3 deletions

View file

@ -13,7 +13,6 @@
inherit (config.vars) mainUser hostName; inherit (config.vars) mainUser hostName;
wanIP = "166.62.180.199";
serviviIP = "100.64.0.7"; serviviIP = "100.64.0.7";
caddyIp = caddyIp =
if hostName == "thingone" if hostName == "thingone"
@ -45,10 +44,14 @@ in {
]; ];
}; };
forceResolveEntry = domain: {
local-zone = ["${domain} always_transparent"];
};
publicApps = remove "nelim.org" (mapAttrsToList (n: v: v.hostName) config.services.caddy.virtualHosts); publicApps = remove "nelim.org" (mapAttrsToList (n: v: v.hostName) config.services.caddy.virtualHosts);
in in
mergeAttrsList ( mergeAttrsList (
(map (x: mkLocalEntry x wanIP) publicApps) (map forceResolveEntry publicApps)
++ [ ++ [
(mkMinecraftEntry "mc.nelim.org" 25569) (mkMinecraftEntry "mc.nelim.org" 25569)
(mkMinecraftEntry "mc2.nelim.org" 25560) (mkMinecraftEntry "mc2.nelim.org" 25560)

View file

@ -26,7 +26,7 @@ in {
]; ];
environment = { environment = {
WG_HOST = "166.62.179.208"; WG_HOST = "nelim.org";
WG_PORT = "51820"; WG_PORT = "51820";
WG_DEFAULT_ADDRESS = "10.6.0.x"; WG_DEFAULT_ADDRESS = "10.6.0.x";
WG_DEFAULT_DNS = "1.0.0.1"; WG_DEFAULT_DNS = "1.0.0.1";