diff --git a/morph/grid/local/config.json b/morph/grid/local/config.json index 7c4b95a5e66d4fce10213f555064f3423557cc05..09074b3a6077b471f999f78de4226648b8c7e617 100644 --- a/morph/grid/local/config.json +++ b/morph/grid/local/config.json @@ -1,7 +1,7 @@ { "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" diff --git a/morph/lib/make-issuer.nix b/morph/lib/make-issuer.nix index 17382c4bed0e548baf49431cda493c4ca7305fee..b5573a15d2e5e8bf75ea370b89506b7877c4bf98 100644 --- a/morph/lib/make-issuer.nix +++ b/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"; diff --git a/morph/lib/make-monitoring.nix b/morph/lib/make-monitoring.nix index c557e270db0a02491b10f9822325dc141ad20fb3..1ee2db347a9ccb099547f1282a516327055ca5fc 100644 --- a/morph/lib/make-monitoring.nix +++ b/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"; diff --git a/morph/lib/make-testing.nix b/morph/lib/make-testing.nix index 149ae7409ee2604cfb21fe31b33157e75da95044..023c9202f9f6a4533815d73636310d2a040b11c7 100644 --- a/morph/lib/make-testing.nix +++ b/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";