From 525ddb5dbd9cb8d13a8325280d4c21949c0a9d95 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@privatestorage.io>
Date: Sun, 30 May 2021 18:53:53 +0000
Subject: [PATCH] Rename monitoringvpnSecretKeyDir -> monitoringvpnKeyDir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
... clean up 🧹
---
morph/grid/local/config.json | 2 +-
morph/lib/make-issuer.nix | 8 ++++----
morph/lib/make-monitoring.nix | 6 +++---
morph/lib/make-testing.nix | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/morph/grid/local/config.json b/morph/grid/local/config.json
index 7c4b95a5..09074b3a 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 17382c4b..b5573a15 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 c557e270..1ee2db34 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 149ae740..023c9202 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";
--
GitLab