Rename monitoringvpnSecretKeyDir -> monitoringvpnKeyDir

... clean up 

morph/grid/local/config.json

 { "publicStoragePort": 8898
 , "ristrettoSigningKeyPath": "../../PrivateStorageSecrets/ristretto.signing-key"
 , "stripeSecretKeyPath": "../../PrivateStorageSecrets/privatestorageio-testing-stripe.secret"
-, "monitoringvpnSecretKeyDir": "../../PrivateStorageSecrets/monitoringvpn"
+, "monitoringvpnKeyDir": "../../PrivateStorageSecrets/monitoringvpn"
 , "passValue": 1000000
 , "issuerDomain": "payments.localdev"
 , "letsEncryptAdminEmail": "florian@privatestorage.io"

morph/lib/make-issuer.nix

@@ -7,18 +7,18 @@
 , sshUsers
 , stateVersion
 , publicIPv4
-, monitoringvpnSecretKeyDir ? null
+, monitoringvpnKeyDir ? null
 , monitoringvpnIPv4 ? null
 , ...
 }: let
 
-  enableVpn = if (monitoringvpnSecretKeyDir != null &&
+  enableVpn = if (monitoringvpnKeyDir != null &&
                   monitoringvpnIPv4 != null)
               then true else false;
 
   vpnSecrets = if !enableVpn then {} else {
     "monitoringvpn-secret-key" = {
-      source = monitoringvpnSecretKeyDir + "/${monitoringvpnIPv4}.key";
+      source = monitoringvpnKeyDir + "/${monitoringvpnIPv4}.key";
       destination = "/run/keys/monitoringvpn/client.key";
       owner.user = "root";
       owner.group = "root";
@@ -26,7 +26,7 @@
       action = ["sudo" "systemctl" "restart" "wireguard-monitoringvpn.service"];
     };
     "monitoringvpn-preshared-key" = {
-      source = monitoringvpnSecretKeyDir + "/preshared.key";
+      source = monitoringvpnKeyDir + "/preshared.key";
       destination = "/run/keys/monitoringvpn/preshared.key";
       owner.user = "root";
       owner.group = "root";

morph/lib/make-monitoring.nix

@@ -2,7 +2,7 @@
 , hardware
 , publicStoragePort
 , ristrettoSigningKeyPath
-, monitoringvpnSecretKeyDir
+, monitoringvpnKeyDir
 , passValue
 , sshUsers
 , stateVersion
@@ -15,7 +15,7 @@
 
     secrets = {
       "monitoringvpn-private-key" = {
-        source = monitoringvpnSecretKeyDir + "/server.key";
+        source = monitoringvpnKeyDir + "/server.key";
         destination = "/run/keys/monitoringvpn/server.key";
         owner.user = "root";
         owner.group = "root";
@@ -23,7 +23,7 @@
         action = ["sudo" "systemctl" "restart" "wireguard-monitoringvpn.service"];
       };
       "monitoringvpn-preshared-key" = {
-        source = monitoringvpnSecretKeyDir + "/preshared.key";
+        source = monitoringvpnKeyDir + "/preshared.key";
         destination = "/run/keys/monitoringvpn/preshared.key";
         owner.user = "root";
         owner.group = "root";

morph/lib/make-testing.nix

@@ -5,17 +5,17 @@
 , passValue
 , sshUsers
 , stateVersion
-, monitoringvpnSecretKeyDir ? null
+, monitoringvpnKeyDir ? null
 , monitoringvpnIPv4 ? null
 , ... }: let
 
-  enableVpn = if (monitoringvpnSecretKeyDir != null &&
+  enableVpn = if (monitoringvpnKeyDir != null &&
                   monitoringvpnIPv4 != null)
               then true else false;
 
   vpnSecrets = if !enableVpn then {} else {
     "monitoringvpn-secret-key" = {
-      source = monitoringvpnSecretKeyDir + "/${monitoringvpnIPv4}.key";
+      source = monitoringvpnKeyDir + "/${monitoringvpnIPv4}.key";
       destination = "/run/keys/monitoringvpn/client.key";
       owner.user = "root";
       owner.group = "root";
@@ -23,7 +23,7 @@
       action = ["sudo" "systemctl" "restart" "wireguard-monitoringvpn.service"];
     };
     "monitoringvpn-preshared-key" = {
-      source = monitoringvpnSecretKeyDir + "/preshared.key";
+      source = monitoringvpnKeyDir + "/preshared.key";
       destination = "/run/keys/monitoringvpn/preshared.key";
       owner.user = "root";
       owner.group = "root";