From 1fecbe31a7b0ef69d251c9200a6dec1cdfbdd020 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 23 Jun 2021 12:30:58 -0400
Subject: [PATCH] These do not need to be recursive sets
---
morph/grid/local/grid.nix | 4 ++--
morph/grid/testing/grid.nix | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 4ca69ef1..6a077af3 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -22,7 +22,7 @@ in lib.make-grid {
nodeExporterTargets = [ "monitoring" "payments" "storage1" "storage2" ];
in {
- payments = rec {
+ payments = {
imports = [
lib.issuer
(import ./virtual-hardware.nix ({ publicIPv4 = "192.168.67.21"; }))
@@ -38,7 +38,7 @@ in lib.make-grid {
];
};
- storage2 = let publicIPv4 = "192.168.67.23"; in rec {
+ storage2 = let publicIPv4 = "192.168.67.23"; in {
imports = [
lib.storage
(import ./virtual-hardware.nix ({ inherit publicIPv4; }))
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index e13f2f12..cfc87a80 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -20,7 +20,7 @@ in lib.make-grid {
nodeExporterTargets = [ "monitoring" "payments" "storage001" ];
in {
- payments = rec {
+ payments = {
imports = [
lib.issuer
lib.hardware-aws
--
GitLab