diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix index e88111bd9f72d751d99c498f51938fffb3b3effd..3010cab5d2412e512c641479dd39c66d32b5629d 100644 --- a/morph/grid/local/grid.nix +++ b/morph/grid/local/grid.nix @@ -13,7 +13,7 @@ let }; # Configure deployment management authorization for all systems in the grid. - deployment = { + grid-config = { services.private-storage.deployment = { authorizedKey = builtins.readFile "${config.publicKeyPath}/deploy_key.pub"; gridName = "local"; @@ -31,7 +31,7 @@ let (gridlib.customize-issuer (config // { monitoringvpnIPv4 = "172.23.23.11"; })) - deployment + grid-config ]; hardware-virtual.publicIPv4 = "192.168.67.21"; }; @@ -43,7 +43,7 @@ let (gridlib.customize-storage (config // { monitoringvpnIPv4 = "172.23.23.12"; })) - deployment + grid-config ]; hardware-virtual.publicIPv4 = "192.168.67.22"; system.stateVersion = "19.09"; @@ -56,7 +56,7 @@ let (gridlib.customize-storage (config // { monitoringvpnIPv4 = "172.23.23.13"; })) - deployment + grid-config ]; hardware-virtual.publicIPv4 = "192.168.67.23"; system.stateVersion = "19.09"; @@ -72,7 +72,7 @@ let googleOAuthClientID = config.monitoringGoogleOAuthClientID; monitoringvpnIPv4 = "172.23.23.1"; }) - deployment + grid-config ]; hardware-virtual.publicIPv4 = "192.168.67.24"; system.stateVersion = "19.09"; diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix index 3b5840d90b4b23bb1a715c8cf76fcbcbe94134a5..5618bcf89128d5cefbb0d084383605b661d4d052 100644 --- a/morph/grid/production/grid.nix +++ b/morph/grid/production/grid.nix @@ -12,7 +12,7 @@ let }; # Configure deployment management authorization for all systems in the grid. - deployment = { + grid-config = { services.private-storage.deployment = { authorizedKey = builtins.readFile "${config.publicKeyPath}/deploy_key.pub"; gridName = "production"; @@ -30,7 +30,7 @@ let (gridlib.customize-issuer (config // { monitoringvpnIPv4 = "172.23.23.11"; })) - deployment + grid-config ]; }; @@ -44,7 +44,7 @@ let googleOAuthClientID = config.monitoringGoogleOAuthClientID; monitoringvpnIPv4 = "172.23.23.1"; }) - deployment + grid-config ]; system.stateVersion = "19.09"; }; @@ -72,7 +72,7 @@ let })) # Also configure deployment management authorization - deployment + grid-config ]; system.stateVersion = stateVersion; diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix index 09ab6fbf9e98efa5672c7e9bee1e9cafb4368332..426ede65048623c027f5bb2b4f5d296364f4598f 100644 --- a/morph/grid/testing/grid.nix +++ b/morph/grid/testing/grid.nix @@ -12,7 +12,7 @@ let }; # Configure deployment management authorization for all systems in the grid. - deployment = { + grid-config = { services.private-storage.deployment = { authorizedKey = builtins.readFile "${config.publicKeyPath}/deploy_key.pub"; gridName = "testing"; @@ -30,7 +30,7 @@ let (gridlib.customize-issuer (config // { monitoringvpnIPv4 = "172.23.23.11"; })) - deployment + grid-config ]; }; @@ -42,7 +42,7 @@ let (gridlib.customize-storage (config // { monitoringvpnIPv4 = "172.23.23.12"; })) - deployment + grid-config ]; system.stateVersion = "19.03"; }; @@ -57,7 +57,7 @@ let googleOAuthClientID = config.monitoringGoogleOAuthClientID; monitoringvpnIPv4 = "172.23.23.1"; }) - deployment + grid-config ]; system.stateVersion = "19.09"; };