diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix index 6718f46ada4073ae3edd45d6a9c42fcaa1813800..eaec7606ea63cf6f2f5e5d936b39e051e74516ab 100644 --- a/morph/grid/local/grid.nix +++ b/morph/grid/local/grid.nix @@ -7,7 +7,7 @@ import ../../lib/make-grid.nix rec { nodes = cfg: let sshUsers = import ../../../../PrivateStorageSecrets/localdev-users.nix; - lib = <nixpkgs/lib>; + vpnClientIPs = [ "172.23.23.11" "172.23.23.12" "172.23.23.13" ]; # TBD: derive automatically in { "payments1" = import ../../lib/make-issuer.nix (rec { publicIPv4 = "192.168.67.21"; @@ -36,7 +36,7 @@ import ../../lib/make-grid.nix rec { "monitoring1" = import ../../lib/make-monitoring.nix (rec { publicIPv4 = "192.168.67.24"; monitoringvpnIPv4 = "172.23.23.1"; - vpnClientIPs = builtins.filter (x: x != null) (map (x: lib.attrByPath (lib.splitString "." "services.private-storage.monitoring.vpn.client.ip") null x) (builtins.attrValues nodes)); + inherit vpnClientIPs; inherit sshUsers; hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; }); stateVersion = "19.09";