diff --git a/config/net/priv.nix b/config/net/priv.nix index 215bdd6..4ac58ed 100644 --- a/config/net/priv.nix +++ b/config/net/priv.nix @@ -18,7 +18,7 @@ lib.mkMerge ( server = "priv${toString n}-gw"; time = 120; max-time = 86400; - router = "priv${toString n}-gw.priv${toString n}"; + router = "priv${toString n}-gw"; }; domainName = "priv${toString n}.zentralwerk.org"; dynamicDomain = true; diff --git a/config/net/pub.nix b/config/net/pub.nix index b55f137..b93adc7 100644 --- a/config/net/pub.nix +++ b/config/net/pub.nix @@ -4,7 +4,7 @@ start = "172.20.78.2"; end = "172.20.79.253"; max-time = 3600; - router = "pub-gw.pub"; + router = "pub-gw"; server = "pub-gw"; time = 300; }; diff --git a/nix/nixos-module/container/dhcp-server.nix b/nix/nixos-module/container/dhcp-server.nix index 29f566a..e0cd465 100644 --- a/nix/nixos-module/container/dhcp-server.nix +++ b/nix/nixos-module/container/dhcp-server.nix @@ -48,7 +48,7 @@ in group { default-lease-time ${toString dhcp.time}; max-lease-time ${toString dhcp.max-time}; - option routers ${config.site.net.${net}.hosts4.${builtins.replaceStrings [".${net}"] [""] dhcp.router}}; + option routers ${config.site.net.${net}.hosts4.${dhcp.router}}; option domain-name "${domainName}"; option domain-name-servers 172.20.73.8, 9.9.9.9; ddns-domainname "${domainName}";