VPN: Add IP parameter

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";

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;
   };
 }

morph/lib/make-monitoring.nix

-{ 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;