diff --git a/morph/grid/local/config.json b/morph/grid/local/config.json index 197ffd69ab30b8059226eb624005e408f71187b5..7c4b95a5e66d4fce10213f555064f3423557cc05 100644 --- a/morph/grid/local/config.json +++ b/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" diff --git a/morph/lib/make-issuer.nix b/morph/lib/make-issuer.nix index f6899fe8d7e640a9cb213cef8f557ee3858cccb5..912b022495166589ae3b13fa0da9a59ee694b38e 100644 --- a/morph/lib/make-issuer.nix +++ b/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"; diff --git a/morph/lib/make-monitoring.nix b/morph/lib/make-monitoring.nix index 9a0f297b3deb5aa9fe02e45aa78adfc66d3665d2..c557e270db0a02491b10f9822325dc141ad20fb3 100644 --- a/morph/lib/make-monitoring.nix +++ b/morph/lib/make-monitoring.nix @@ -3,7 +3,6 @@ , publicStoragePort , ristrettoSigningKeyPath , monitoringvpnSecretKeyDir -, monitoringvpnPresharedKeyPath , passValue , sshUsers , stateVersion @@ -24,7 +23,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"; diff --git a/morph/lib/make-testing.nix b/morph/lib/make-testing.nix index 35c70f8f789633489b431e57a23b4259102df5da..050c4399731506738bb4bbee357ec218032e4964 100644 --- a/morph/lib/make-testing.nix +++ b/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";