greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove option 'services.nix-bitcoin.enable'

Browse Source 
Users can enable the node config just by importing secure-node.nix
This commit is contained in:
Erik Arvstedt 2020-04-07 22:47:34 +02:00
parent 0f8b2e91fd
commit 1a63f0ca6a
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/configuration.nix
View File

@ -18,10 +18,7 @@
#./hardware-configuration.nix #./hardware-configuration.nix
]; ];
# FIXME: Enable modules by uncommenting their respective line. Disable # FIXME: Enable modules by uncommenting their respective line. Disable
# modules by commenting out their respective line. Enable this module to # modules by commenting out their respective line.
# use the nix-bitcoin node configuration. Only disable this if you know what
# you are doing.
services.nix-bitcoin.enable = true;
### BITCOIND ### BITCOIND
# Bitcoind is enabled by default if nix-bitcoin is enabled # Bitcoind is enabled by default if nix-bitcoin is enabled

8
modules/nix-bitcoin.nix
View File

@ -1,3 +1,9 @@
# This file exists only for backwards compatibility # 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
modules/presets/secure-node.nix
View File

@ -3,7 +3,6 @@
with lib; with lib;
let let
cfg = config.services.nix-bitcoin;
operatorCopySSH = pkgs.writeText "operator-copy-ssh.sh" '' operatorCopySSH = pkgs.writeText "operator-copy-ssh.sh" ''
mkdir -p ${config.users.users.operator.home}/.ssh mkdir -p ${config.users.users.operator.home}/.ssh
if [ -e "${config.users.users.root.home}/.vbox-nixops-client-key" ]; then if [ -e "${config.users.users.root.home}/.vbox-nixops-client-key" ]; then

1
test/test.nix
View File

@ -16,7 +16,6 @@ import ./make-test.nix rec {
# hardened # hardened
]; ];
services.nix-bitcoin.enable = true;
services.bitcoind.extraConfig = mkForce "connect=0"; services.bitcoind.extraConfig = mkForce "connect=0";
services.clightning.enable = true; services.clightning.enable = true;