From 4a28b54e611309d36e8f152cacbb7e83d7c86aaa Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@private.storage>
Date: Thu, 10 Feb 2022 14:14:28 -0700
Subject: [PATCH] s/monitoringvpnEndpoint/monitoringvpnPublicEndpoint/
---
morph/grid/local/config.json | 2 +-
morph/grid/local/grid.nix | 6 ++----
morph/grid/production/config.json | 2 +-
morph/grid/production/grid.nix | 2 +-
morph/grid/testing/config.json | 2 +-
morph/grid/testing/grid.nix | 2 +-
morph/lib/base.nix | 2 +-
morph/lib/issuer.nix | 4 ++--
morph/lib/storage.nix | 4 ++--
9 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/morph/grid/local/config.json b/morph/grid/local/config.json
index 52809842..871ef84b 100644
--- a/morph/grid/local/config.json
+++ b/morph/grid/local/config.json
@@ -2,7 +2,7 @@
, "publicStoragePort": 8898
, "publicKeyPath": "./public-keys"
, "privateKeyPath": "./private-keys"
-, "monitoringvpnEndpoint": "192.168.56.24:51820"
+, "monitoringvpnPublicEndpoint": "192.168.56.24:51820"
, "passValue": 1000000
, "issuerDomains": ["payments.localdev"]
, "monitoringDomains": ["monitoring.localdev"]
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index da8a8381..3f15b34a 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -1,8 +1,6 @@
let
- pkgs = import <nixpkgs> { };
-
gridlib = import ../../lib;
- grid-config = pkgs.lib.trivial.importJSON ./config.json;
+ grid-config = gridlib.pkgs.lib.trivial.importJSON ./config.json;
ssh-users = let
ssh-users-file = ./public-keys/users.nix;
@@ -59,7 +57,7 @@ let
grid = {
publicKeyPath = toString ./. + "/${grid-config.publicKeyPath}";
privateKeyPath = toString ./. + "/${grid-config.privateKeyPath}";
- inherit (grid-config) monitoringvpnEndpoint letsEncryptAdminEmail;
+ inherit (grid-config) monitoringvpnPublicEndpoint letsEncryptAdminEmail;
};
# Configure deployment management authorization for all systems in the grid.
services.private-storage.deployment = {
diff --git a/morph/grid/production/config.json b/morph/grid/production/config.json
index 8cdeaab9..15d2ca2e 100644
--- a/morph/grid/production/config.json
+++ b/morph/grid/production/config.json
@@ -2,7 +2,7 @@
, "publicStoragePort": 8898
, "privateKeyPath": "./private-keys"
, "publicKeyPath": "./public-keys"
-, "monitoringvpnEndpoint": "monitoring.private.storage:51820"
+, "monitoringvpnPublicEndpoint": "monitoring.private.storage:51820"
, "passValue": 1000000
, "issuerDomains": [
"payments.private.storage"
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index ab45d4ba..fbff6026 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -21,7 +21,7 @@ let
grid = {
publicKeyPath = toString ./. + "/${grid-config.publicKeyPath}";
privateKeyPath = toString ./. + "/${grid-config.privateKeyPath}";
- inherit (grid-config) monitoringvpnEndpoint letsEncryptAdminEmail;
+ inherit (grid-config) monitoringvpnPublicEndpoint letsEncryptAdminEmail;
};
# Configure deployment management authorization for all systems in the grid.
services.private-storage.deployment = {
diff --git a/morph/grid/testing/config.json b/morph/grid/testing/config.json
index ba48a27d..87ea03eb 100644
--- a/morph/grid/testing/config.json
+++ b/morph/grid/testing/config.json
@@ -2,7 +2,7 @@
, "publicStoragePort": 8898
, "privateKeyPath": "./private-keys"
, "publicKeyPath": "./public-keys"
-, "monitoringvpnEndpoint": "monitoring.privatestorage-staging.com:51820"
+, "monitoringvpnPublicEndpoint": "monitoring.privatestorage-staging.com:51820"
, "passValue": 1000000
, "issuerDomains": [
"payments.privatestorage-staging.com"
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index 19839ae8..f9e1a366 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -21,7 +21,7 @@ let
grid = {
publicKeyPath = toString ./. + "/${grid-config.publicKeyPath}";
privateKeyPath = toString ./. + "/${grid-config.privateKeyPath}";
- inherit (grid-config) monitoringvpnEndpoint letsEncryptAdminEmail;
+ inherit (grid-config) monitoringvpnPublicEndpoint letsEncryptAdminEmail;
};
# Configure deployment management authorization for all systems in the grid.
services.private-storage.deployment = {
diff --git a/morph/lib/base.nix b/morph/lib/base.nix
index aafbf4f4..6fb5fccd 100644
--- a/morph/lib/base.nix
+++ b/morph/lib/base.nix
@@ -24,7 +24,7 @@
The IPv4 address of this node on the monitoring VPN.
'';
};
- monitoringvpnEndpoint = lib.mkOption {
+ monitoringvpnPublicEndpoint = lib.mkOption {
type = lib.types.str;
description = ''
The domain name and port of the monitoring VPN endpoint.
diff --git a/morph/lib/issuer.nix b/morph/lib/issuer.nix
index 69b0527c..a5a39ed4 100644
--- a/morph/lib/issuer.nix
+++ b/morph/lib/issuer.nix
@@ -2,7 +2,7 @@
# "issuer"-type system.
{ lib, config, ...}:
let
- inherit (config.grid) publicKeyPath privateKeyPath monitoringvpnEndpoint monitoringvpnIPv4;
+ inherit (config.grid) publicKeyPath privateKeyPath monitoringvpnPublicEndpoint monitoringvpnIPv4;
inherit (config.grid.issuer) issuerDomains allowedChargeOrigins;
in {
imports = [
@@ -82,7 +82,7 @@ in {
services.private-storage.monitoring.vpn.client = {
enable = true;
ip = monitoringvpnIPv4;
- endpoint = monitoringvpnEndpoint;
+ endpoint = monitoringvpnPublicEndpoint;
endpointPublicKeyFile = "${publicKeyPath}/monitoringvpn/server.pub";
};
diff --git a/morph/lib/storage.nix b/morph/lib/storage.nix
index 71e3c223..f1b445f2 100644
--- a/morph/lib/storage.nix
+++ b/morph/lib/storage.nix
@@ -2,7 +2,7 @@
# "storage"-type system.
{ lib, config, ...} :
let
- inherit (config.grid) publicKeyPath privateKeyPath monitoringvpnIPv4 monitoringvpnEndpoint;
+ inherit (config.grid) publicKeyPath privateKeyPath monitoringvpnIPv4 monitoringvpnPublicEndpoint;
in {
# Any extra NixOS modules to load on this server.
imports = [
@@ -81,7 +81,7 @@ in {
services.private-storage.monitoring.vpn.client = {
enable = true;
ip = monitoringvpnIPv4;
- endpoint = monitoringvpnEndpoint;
+ endpoint = monitoringvpnPublicEndpoint;
endpointPublicKeyFile = "${publicKeyPath}/monitoringvpn/server.pub";
};
};
--
GitLab