Merge branch '344.integrate-monitoring-into-local-grid' into 346.add-monitoring-to-staging

morph/grid/local/config.json

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

morph/lib/make-issuer.nix

@@ -2,7 +2,6 @@
 , ristrettoSigningKeyPath
 , stripeSecretKeyPath
 , monitoringvpnSecretKeyDir
-, monitoringvpnPresharedKeyPath
 , issuerDomain
 , letsEncryptAdminEmail
 , allowedChargeOrigins
@@ -41,7 +40,7 @@
         action = ["sudo" "systemctl" "restart" "wireguard-monitoringvpn.service"];
       };
       "monitoringvpn-preshared-key" = {
-        source = monitoringvpnPresharedKeyPath;
+        source = monitoringvpnSecretKeyDir + "/preshared.key";
         destination = "/run/keys/monitoringvpn/preshared.key";
         owner.user = "root";
         owner.group = "root";

morph/lib/make-monitoring.nix

@@ -3,7 +3,6 @@
 , publicStoragePort
 , ristrettoSigningKeyPath
 , monitoringvpnSecretKeyDir
-, monitoringvpnPresharedKeyPath
 , passValue
 , sshUsers
 , stateVersion
@@ -38,7 +37,7 @@ rec {
         action = ["sudo" "systemctl" "restart" "wireguard-monitoringvpn.service"];
       };
       "monitoringvpn-preshared-key" = {
-        source = monitoringvpnPresharedKeyPath;
+        source = monitoringvpnSecretKeyDir + "/preshared.key";
         destination = "/run/keys/monitoringvpn/preshared.key";
         owner.user = "root";
         owner.group = "root";

morph/lib/make-testing.nix

@@ -3,7 +3,6 @@
 , publicStoragePort
 , ristrettoSigningKeyPath
 , monitoringvpnSecretKeyDir
-, monitoringvpnPresharedKeyPath
 , passValue
 , sshUsers
 , stateVersion
@@ -34,7 +33,7 @@
         action = ["sudo" "systemctl" "restart" "wireguard-monitoringvpn.service"];
       };
       "monitoringvpn-preshared-key" = {
-        source = monitoringvpnPresharedKeyPath;
+        source = monitoringvpnSecretKeyDir + "/preshared.key";
         destination = "/run/keys/monitoringvpn/preshared.key";
         owner.user = "root";
         owner.group = "root";