Merge branch '341.monitoring-vpn' into 344.integrate-monitoring-into-local-grid

morph/grid/local/config.json

@@ -2,6 +2,7 @@
 , "ristrettoSigningKeyPath": "../../PrivateStorageSecrets/ristretto.signing-key"
 , "stripeSecretKeyPath": "../../PrivateStorageSecrets/privatestorageio-testing-stripe.secret"
 , "monitoringvpnKeyDir": "../../PrivateStorageSecrets/monitoringvpn"
+, "monitoringvpnEndpoint": "192.168.67.24:51820"
 , "passValue": 1000000
 , "issuerDomain": "payments.localdev"
 , "letsEncryptAdminEmail": "florian@privatestorage.io"

morph/lib/make-issuer.nix

@@ -9,11 +9,13 @@
 , publicIPv4
 , monitoringvpnKeyDir ? null
 , monitoringvpnIPv4 ? null
+, monitoringvpnEndpoint ? null
 , ...
 }: let
 
   enableVpn = monitoringvpnKeyDir != null &&
-              monitoringvpnIPv4 != null;
+              monitoringvpnIPv4 != null &&
+              monitoringvpnEndpoint != null;
 
   vpnSecrets = if !enableVpn then {} else {
     "monitoringvpn-secret-key" = {
@@ -83,5 +85,6 @@ in rec {
   services.private-storage.monitoring.vpn.client = if !enableVpn then {} else {
     enable = true;
     ip = monitoringvpnIPv4;
+    endpoint = monitoringvpnEndpoint;
   };
 }

morph/lib/make-testing.nix

@@ -7,10 +7,12 @@
 , stateVersion
 , monitoringvpnKeyDir ? null
 , monitoringvpnIPv4 ? null
+, monitoringvpnEndpoint ? null
 , ... }: let
 
   enableVpn = monitoringvpnKeyDir != null &&
-              monitoringvpnIPv4 != null;
+              monitoringvpnIPv4 != null &&
+              monitoringvpnEndpoint != null;
 
   vpnSecrets = if !enableVpn then {} else {
     "monitoringvpn-secret-key" = {
@@ -72,5 +74,6 @@ in rec {
   services.private-storage.monitoring.vpn.client = if !enableVpn then {} else {
     enable = true;
     ip = monitoringvpnIPv4;
+    endpoint = monitoringvpnEndpoint;
   };
 }

nixos/modules/monitoring/vpn/client.nix

@@ -42,7 +42,6 @@ in {
     endpoint = lib.mkOption {
       type = lib.types.str;
       example = lib.literalExample "vpn.monitoring.private.storage:54321";
-      default = "192.168.67.24:51820";
       description = ''
         The address and port number of the server to establish the VPN with.
       '';