From 73333db9e6829c10f774aaa9fe42fc995b33731f Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@private.storage>
Date: Thu, 26 Aug 2021 05:19:54 -0600
Subject: [PATCH] s/deployment/grid-config/
---
morph/grid/local/grid.nix | 10 +++++-----
morph/grid/production/grid.nix | 8 ++++----
morph/grid/testing/grid.nix | 8 ++++----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index e88111bd..3010cab5 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 3b5840d9..5618bcf8 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 09ab6fbf..426ede65 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";
};
--
GitLab