Skip to content
Snippets Groups Projects
Unverified Commit e5f8222c authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Move responsibility for disabling upstream tahoe.

parent 75ca7473
No related branches found
No related tags found
1 merge request!43Improved Tahoe-LAFS systemd unit ExecStartPre
...@@ -21,14 +21,6 @@ let ...@@ -21,14 +21,6 @@ let
max-incident-age = "29d"; max-incident-age = "29d";
in 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 = [ imports = [
# Give it a good SSH configuration. # Give it a good SSH configuration.
./ssh.nix ./ssh.nix
......
...@@ -9,6 +9,14 @@ let ...@@ -9,6 +9,14 @@ let
ini = pkgs.callPackage ../lib/ini.nix { }; ini = pkgs.callPackage ../lib/ini.nix { };
in 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 = { options.services.tahoe = {
introducers = mkOption { introducers = mkOption {
default = {}; default = {};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment