diff --git a/nix/lib/config/legacy.nix b/nix/lib/config/legacy.nix index ceaed3f..88cc5e0 100644 --- a/nix/lib/config/legacy.nix +++ b/nix/lib/config/legacy.nix @@ -196,67 +196,67 @@ in upstream4.forwardPorts = [ { - destination = config.site.net.serv.public-access-proxy; + destination = config.site.net.serv.hosts4.public-access-proxy; proto = "tcp"; sourcePort = 80; } { - destination = config.site.net.serv.public-access-proxy; + destination = config.site.net.serv.hosts4.public-access-proxy; proto = "tcp"; sourcePort = 443; } { - destination = config.site.net.serv.bind; + destination = config.site.net.serv.hosts4.bind; proto = "tcp"; sourcePort = 53; } { - destination = config.site.net.serv.bind; + destination = config.site.net.serv.hosts4.bind; proto = "udp"; sourcePort = 53; } { - destination = config.site.net.c3d2.dn42; + destination = config.site.net.c3d2.hosts4.dn42; proto = "udp"; sourcePort = 2325; } { - destination = config.site.net.c3d2.dn42; + destination = config.site.net.c3d2.hosts4.dn42; proto = "udp"; sourcePort = 2399; } { - destination = config.site.net.c3d2.dn42; + destination = config.site.net.c3d2.hosts4.dn42; proto = "udp"; sourcePort = 2327; } { - destination = config.site.net.c3d2.dn42; + destination = config.site.net.c3d2.hosts4.dn42; proto = "udp"; sourcePort = 2338; } { - destination = config.site.net.c3d2.dn42; + destination = config.site.net.c3d2.hosts4.dn42; proto = "udp"; sourcePort = 2339; } { - destination = config.site.net.c3d2.dn42; + destination = config.site.net.c3d2.hosts4.dn42; proto = "udp"; sourcePort = 40533; } { - destination = config.site.net.c3d2.dn42; + destination = config.site.net.c3d2.hosts4.dn42; proto = "udp"; sourcePort = 61699; } { - destination = "${config.site.net.serv.leonos}:22"; + destination = "${config.site.net.serv.hosts4.leonos}:22"; proto = "tcp"; sourcePort = 2223; } { - destination = config.site.net.serv.minetest; + destination = config.site.net.serv.hosts4.minetest; proto = "udp"; sourcePort = 30000; } diff --git a/nix/nixos-module/defaults.nix b/nix/nixos-module/defaults.nix index 8333a19..759006e 100644 --- a/nix/nixos-module/defaults.nix +++ b/nix/nixos-module/defaults.nix @@ -42,7 +42,7 @@ output.logstash: # Boolean flag to enable or disable the output module. enabled: true - hosts: ["${config.site.net.serv.logging}:5044"] + hosts: ["${config.site.net.serv.hosts4.logging}:5044"] ''; };