From e5f8222c09e31a41d1340d7e3f15cfe83c2b601c Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 19 Jun 2020 18:01:13 -0400
Subject: [PATCH] Move responsibility for disabling upstream tahoe.
---
nixos/modules/private-storage.nix | 8 --------
nixos/modules/tahoe.nix | 8 ++++++++
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/nixos/modules/private-storage.nix b/nixos/modules/private-storage.nix
index cada491e..3b979bfb 100644
--- a/nixos/modules/private-storage.nix
+++ b/nixos/modules/private-storage.nix
@@ -21,14 +21,6 @@ let
max-incident-age = "29d";
in
{
- # Upstream tahoe-lafs module conflicts with ours (since ours is a
- # copy/paste/edit of upstream's...). Disable it.
- #
- # https://nixos.org/nixos/manual/#sec-replace-modules
- disabledModules =
- [ "services/network-filesystems/tahoe.nix"
- ];
-
imports = [
# Give it a good SSH configuration.
./ssh.nix
diff --git a/nixos/modules/tahoe.nix b/nixos/modules/tahoe.nix
index 8ea35886..49881093 100644
--- a/nixos/modules/tahoe.nix
+++ b/nixos/modules/tahoe.nix
@@ -9,6 +9,14 @@ let
ini = pkgs.callPackage ../lib/ini.nix { };
in
{
+ # Upstream tahoe-lafs module conflicts with ours (since ours is a
+ # copy/paste/edit of upstream's...). Disable it.
+ #
+ # https://nixos.org/nixos/manual/#sec-replace-modules
+ disabledModules =
+ [ "services/network-filesystems/tahoe.nix"
+ ];
+
options.services.tahoe = {
introducers = mkOption {
default = {};
--
GitLab