diff --git a/morph/grid/local/config.json b/morph/grid/local/config.json index cebcc2ae55233b0221c3657ed170c15233eea294..8b23b6f1152be4fa94e8935342bf11f7706d036c 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 e1bcbe43501c109ef6dacee62f422ac6f5a506bc..3def2d77556e8b82b5fd0dbd2513f3d08b7ea2c7 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 f9ca1b0b7bb2f4ecf1f36497540d54ff5e736cf4..ee05f9195a67eff6734cef8cef6e26c5ca465f09 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 17de72837d1f2b3faaea6832a7d6fce6ae5cdc01..e663d2243e4aa6078260e41f07f807f606e64ef6 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 10c772c518ff51f19f8df15f46a6e39da200e3ba..e3185377fc712272622bf6a7a2c410e8ea38a43c 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 ed07b504e743b53f30c2347483f3a0f47f728f83..fbbbd9f13e49cfdc7fd2f0687fa2fe12df91ea33 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"; })