Skip to content

Commit

Permalink
remove option 'services.nix-bitcoin.enable'
Browse files Browse the repository at this point in the history
Users can enable the node config just by importing secure-node.nix
  • Loading branch information
erikarvstedt committed Apr 8, 2020
1 parent 0f8b2e9 commit 1a63f0c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
5 changes: 1 addition & 4 deletions examples/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
#./hardware-configuration.nix
];
# FIXME: Enable modules by uncommenting their respective line. Disable
# modules by commenting out their respective line. Enable this module to
# use the nix-bitcoin node configuration. Only disable this if you know what
# you are doing.
services.nix-bitcoin.enable = true;
# modules by commenting out their respective line.

### BITCOIND
# Bitcoind is enabled by default if nix-bitcoin is enabled
Expand Down
8 changes: 7 additions & 1 deletion modules/nix-bitcoin.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# This file exists only for backwards compatibility

import ./presets/secure-node.nix
{ lib, ... }:
{
imports = [
./presets/secure-node.nix
(lib.mkRemovedOptionModule [ "services" "nix-bitcoin" "enable" ] "Please directly import ./presets/secure-node.nix")
]
}
1 change: 0 additions & 1 deletion modules/presets/secure-node.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
with lib;

let
cfg = config.services.nix-bitcoin;
operatorCopySSH = pkgs.writeText "operator-copy-ssh.sh" ''
mkdir -p ${config.users.users.operator.home}/.ssh
if [ -e "${config.users.users.root.home}/.vbox-nixops-client-key" ]; then
Expand Down
1 change: 0 additions & 1 deletion test/test.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import ./make-test.nix rec {
# hardened
];

services.nix-bitcoin.enable = true;
services.bitcoind.extraConfig = mkForce "connect=0";

services.clightning.enable = true;
Expand Down

0 comments on commit 1a63f0c

Please sign in to comment.