From 9c0922c5e001faff090ba4daaaf64537d48682ac Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Thu, 17 Jun 2021 23:48:04 +0000
Subject: [PATCH] Rename nodes to align better with testing and production
---
morph/grid/local/grid.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 0c114ccf..fdc0cde5 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -13,16 +13,16 @@ import ../../lib/make-grid.nix {
# TBD: derive these automatically:
hostsMap = {
- "172.23.23.1" = [ "monitoring1" "monitoring1.monitoringvpn" ];
- "172.23.23.11" = [ "payments1" "payments1.monitoringvpn" ];
+ "172.23.23.1" = [ "monitoring" "monitoring.monitoringvpn" ];
+ "172.23.23.11" = [ "payments" "payments.monitoringvpn" ];
"172.23.23.12" = [ "storage1" "storage1.monitoringvpn" ];
"172.23.23.13" = [ "storage2" "storage2.monitoringvpn" ];
};
vpnClientIPs = [ "172.23.23.11" "172.23.23.12" "172.23.23.13" ];
- nodeExporterTargets = [ "monitoring1" "payments1" "storage1" "storage2" ];
+ nodeExporterTargets = [ "monitoring" "payments" "storage1" "storage2" ];
in {
- "payments1" = import ../../lib/make-issuer.nix (cfg // rec {
+ "payments" = import ../../lib/make-issuer.nix (cfg // rec {
publicIPv4 = "192.168.67.21";
monitoringvpnIPv4 = "172.23.23.11";
hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
@@ -49,7 +49,7 @@ import ../../lib/make-grid.nix {
inherit sshUsers;
});
- "monitoring1" = import ../../lib/make-monitoring.nix (cfg // rec {
+ "monitoring" = import ../../lib/make-monitoring.nix (cfg // rec {
publicIPv4 = "192.168.67.24";
monitoringvpnIPv4 = "172.23.23.1";
inherit vpnClientIPs;
--
GitLab