diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix index 1be6bffc5d24d5e7522b0970e30c67eb7b957790..3df4e2719b775536121aef89535ecf2d8ed5efcc 100644 --- a/morph/grid/local/grid.nix +++ b/morph/grid/local/grid.nix @@ -10,6 +10,7 @@ import ../../lib/make-grid.nix { in { "payments1" = import ../../lib/make-issuer.nix (rec { publicIPv4 = "192.168.67.21"; + monitoringvpnIPv4 = "172.23.23.11"; inherit sshUsers; hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; }); stateVersion = "19.03"; @@ -31,6 +32,7 @@ import ../../lib/make-grid.nix { "monitoring1" = import ../../lib/make-monitoring.nix (rec { publicIPv4 = "192.168.67.24"; + monitoringvpnIPv4 = "172.23.23.1"; inherit sshUsers; hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; }); stateVersion = "19.09"; diff --git a/morph/lib/make-issuer.nix b/morph/lib/make-issuer.nix index 15c8f58f26cb6a2ad034c6e10391f4836be33bd9..789ff9d5e0f6af90ab6beb1e17f96bf114db76c9 100644 --- a/morph/lib/make-issuer.nix +++ b/morph/lib/make-issuer.nix @@ -7,6 +7,7 @@ , sshUsers , stateVersion , publicIPv4 +, monitoringvpnIPv4 , ... }: { deployment = { @@ -71,6 +72,6 @@ services.private-storage.monitoring.vpn.client = { enable = true; - ip = "172.23.23.11"; + ip = monitoringvpnIPv4; }; } diff --git a/morph/lib/make-monitoring.nix b/morph/lib/make-monitoring.nix index 07fc5f0b6e4737283e5e2ed6a0c8049f6dae5307..0d8ad9e1468caf5715ea1d5769a8e7b1c9782ea9 100644 --- a/morph/lib/make-monitoring.nix +++ b/morph/lib/make-monitoring.nix @@ -1,4 +1,4 @@ -{ publicIPv4, hardware, publicStoragePort, ristrettoSigningKeyPath, passValue, sshUsers, stateVersion, ... }: rec { +{ publicIPv4, hardware, publicStoragePort, ristrettoSigningKeyPath, passValue, sshUsers, stateVersion, monitoringvpnIPv4, ... }: rec { deployment = { targetHost = publicIPv4; @@ -38,7 +38,7 @@ services.private-storage.monitoring.vpn.server = { enable = true; - ip = "172.23.23.1"; + ip = monitoringvpnIPv4; }; system.stateVersion = stateVersion;