From 60cf3e17b7765d4ed6037de9c5def9e00942c123 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Fri, 16 Jul 2021 03:06:21 +0000
Subject: [PATCH] Rename google auth option to make clear it's for the
monitoring system
---
morph/grid/local/config.json | 2 +-
morph/grid/local/grid.nix | 3 ++-
morph/grid/production/config.json | 2 +-
morph/grid/production/grid.nix | 3 ++-
morph/grid/testing/config.json | 2 +-
morph/grid/testing/grid.nix | 3 ++-
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/morph/grid/local/config.json b/morph/grid/local/config.json
index cebcc2ae..8b23b6f1 100644
--- a/morph/grid/local/config.json
+++ b/morph/grid/local/config.json
@@ -9,5 +9,5 @@
, "allowedChargeOrigins": [
"http://localhost:5000"
]
-, "googleOAuthClientID": ""
+, "monitoringGoogleOAuthClientID": ""
}
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index e1bcbe43..3def2d77 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -61,7 +61,8 @@ let
(gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.24"; }))
(gridlib.customize-monitoring {
inherit hostsMap vpnClientIPs nodeExporterTargets paymentExporterTargets;
- inherit (config) domain publicKeyPath privateKeyPath letsEncryptAdminEmail googleOAuthClientID;
+ inherit (config) domain publicKeyPath privateKeyPath letsEncryptAdminEmail;
+ googleOAuthClientID = config.monitoringGoogleOAuthClientID;
monitoringvpnIPv4 = "172.23.23.1";
stateVersion = "19.09";
})
diff --git a/morph/grid/production/config.json b/morph/grid/production/config.json
index f9ca1b0b..ee05f919 100644
--- a/morph/grid/production/config.json
+++ b/morph/grid/production/config.json
@@ -15,5 +15,5 @@
, "https://private.storage"
, "https://www.private.storage"
]
-, "googleOAuthClientID": "productiongrid-replaceme"
+, "monitoringGoogleOAuthClientID": "productiongrid-replaceme"
}
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index 17de7283..e663d224 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -38,7 +38,8 @@ let
gridlib.hardware-aws
(gridlib.customize-monitoring {
inherit hostsMap vpnClientIPs nodeExporterTargets paymentExporterTargets;
- inherit (config) domain publicKeyPath privateKeyPath letsEncryptAdminEmail googleOAuthClientID;
+ inherit (config) domain publicKeyPath privateKeyPath letsEncryptAdminEmail;
+ googleOAuthClientID = config.monitoringGoogleOAuthClientID;
monitoringvpnIPv4 = "172.23.23.1";
stateVersion = "19.09";
})
diff --git a/morph/grid/testing/config.json b/morph/grid/testing/config.json
index 10c772c5..e3185377 100644
--- a/morph/grid/testing/config.json
+++ b/morph/grid/testing/config.json
@@ -14,5 +14,5 @@
, "https://privatestorage-staging.com"
, "https://www.privatestorage-staging.com"
]
-, "googleOAuthClientID": "testinggrid-replaceme"
+, "monitoringGoogleOAuthClientID": "testinggrid-replaceme"
}
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index ed07b504..fbbbd9f1 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -51,7 +51,8 @@ let
gridlib.hardware-aws
(gridlib.customize-monitoring {
inherit hostsMap vpnClientIPs nodeExporterTargets paymentExporterTargets;
- inherit (config) domain publicKeyPath privateKeyPath letsEncryptAdminEmail googleOAuthClientID;
+ inherit (config) domain publicKeyPath privateKeyPath letsEncryptAdminEmail;
+ googleOAuthClientID = config.monitoringGoogleOAuthClientID;
monitoringvpnIPv4 = "172.23.23.1";
stateVersion = "19.09";
})
--
GitLab