Skip to content
Snippets Groups Projects
Commit 791a48d7 authored by Florian Sesser's avatar Florian Sesser
Browse files

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

parents 15e14888 5e99d8f4
No related branches found
No related tags found
3 merge requests!108Merge staging into production,!107Merge develop into staging,!88Integrate monitoring into local grid
Pipeline #588 failed
......@@ -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"
......
......@@ -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";
......
......@@ -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";
......
......@@ -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";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment