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

Rename google auth option to make clear it's for the monitoring system

parent 3de4e68b
No related branches found
No related tags found
3 merge requests!140Merge staging into production,!122Merge develop into staging,!120Add GSuite SSO to Grafana
Pipeline #860 passed
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
, "allowedChargeOrigins": [ , "allowedChargeOrigins": [
"http://localhost:5000" "http://localhost:5000"
] ]
, "googleOAuthClientID": "" , "monitoringGoogleOAuthClientID": ""
} }
...@@ -61,7 +61,8 @@ let ...@@ -61,7 +61,8 @@ let
(gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.24"; })) (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.24"; }))
(gridlib.customize-monitoring { (gridlib.customize-monitoring {
inherit hostsMap vpnClientIPs nodeExporterTargets paymentExporterTargets; 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"; monitoringvpnIPv4 = "172.23.23.1";
stateVersion = "19.09"; stateVersion = "19.09";
}) })
......
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
, "https://private.storage" , "https://private.storage"
, "https://www.private.storage" , "https://www.private.storage"
] ]
, "googleOAuthClientID": "productiongrid-replaceme" , "monitoringGoogleOAuthClientID": "productiongrid-replaceme"
} }
...@@ -38,7 +38,8 @@ let ...@@ -38,7 +38,8 @@ let
gridlib.hardware-aws gridlib.hardware-aws
(gridlib.customize-monitoring { (gridlib.customize-monitoring {
inherit hostsMap vpnClientIPs nodeExporterTargets paymentExporterTargets; 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"; monitoringvpnIPv4 = "172.23.23.1";
stateVersion = "19.09"; stateVersion = "19.09";
}) })
......
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
, "https://privatestorage-staging.com" , "https://privatestorage-staging.com"
, "https://www.privatestorage-staging.com" , "https://www.privatestorage-staging.com"
] ]
, "googleOAuthClientID": "testinggrid-replaceme" , "monitoringGoogleOAuthClientID": "testinggrid-replaceme"
} }
...@@ -51,7 +51,8 @@ let ...@@ -51,7 +51,8 @@ let
gridlib.hardware-aws gridlib.hardware-aws
(gridlib.customize-monitoring { (gridlib.customize-monitoring {
inherit hostsMap vpnClientIPs nodeExporterTargets paymentExporterTargets; 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"; monitoringvpnIPv4 = "172.23.23.1";
stateVersion = "19.09"; stateVersion = "19.09";
}) })
......
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