From 1521040c80cadf113aa8bc08e03bfed28590c420 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 23 Jun 2021 14:27:26 -0400
Subject: [PATCH] We're configuring "100tb" elsewhere now
---
morph/grid/production/grid.nix | 6 ++++--
morph/lib/storage.nix | 8 --------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index e507fb36..ec6aba35 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -42,8 +42,10 @@ let
(lib.customize-storage config sshUsers nodecfg.publicIPv4 monitoringvpnKeyDir vpnIP stateVersion)
];
- # And supply configuration for those hardware / network / bootloader options.
- "100tb".config = nodecfg;
+ # And supply configuration for those hardware / network / bootloader
+ # options. See the 100tb module for handling of this value. The module
+ # name is quoted because `1` makes `100tb` look an awful lot like
+ "100tb".config = nodecfg;
};
# Define all of the storage nodes for this grid.
diff --git a/morph/lib/storage.nix b/morph/lib/storage.nix
index c0c702a8..2835e024 100644
--- a/morph/lib/storage.nix
+++ b/morph/lib/storage.nix
@@ -42,14 +42,6 @@ rec {
../../nixos/modules/monitoring/exporters/node.nix
];
- # Pass the configuration specific to this host to the 100TB module to be
- # expanded into a complete system configuration. See the 100tb module for
- # handling of this value.
- #
- # The module name is quoted because `1` makes `100tb` look an awful lot like
- # it should be a number.
- # "100tb".config = cfg;
-
# Turn on the Private Storage (Tahoe-LAFS) service.
services.private-storage = {
# Yep. Turn it on.
--
GitLab