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

clightning: remove bitcoin-rpcuser option

Browse Source 
Simplifies the clightning module.
This commit is contained in:
nixbitcoin 2020-06-10 15:31:57 +00:00
parent 65b5dab3d4
commit ae1230e13b
No known key found for this signature in database
GPG Key ID: DD11F9AD5308B3BA
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/clightning.nix
View File

@ -12,7 +12,7 @@ let
${optionalString (cfg.proxy != null) "proxy=${cfg.proxy}"} ${optionalString (cfg.proxy != null) "proxy=${cfg.proxy}"}
always-use-proxy=${if cfg.always-use-proxy then "true" else "false"} always-use-proxy=${if cfg.always-use-proxy then "true" else "false"}
${optionalString (cfg.bind-addr != null) "bind-addr=${cfg.bind-addr}"} ${optionalString (cfg.bind-addr != null) "bind-addr=${cfg.bind-addr}"}
bitcoin-rpcuser=${cfg.bitcoin-rpcuser} bitcoin-rpcuser=${config.services.bitcoind.rpcuser}
rpc-file-mode=0660 rpc-file-mode=0660
''; '';
in { in {
@ -54,12 +54,6 @@ in {
default = false; default = false;
description = "Announce clightning Tor Hidden Service"; description = "Announce clightning Tor Hidden Service";
}; };
bitcoin-rpcuser = mkOption {
type = types.str;
description = ''
Bitcoin RPC user
'';
};
dataDir = mkOption { dataDir = mkOption {
type = types.path; type = types.path;
default = "/var/lib/clightning"; default = "/var/lib/clightning";

1
modules/presets/secure-node.nix
View File

@ -75,7 +75,6 @@ in {
# clightning # clightning
services.clightning = { services.clightning = {
bitcoin-rpcuser = cfg.bitcoind.rpcuser;
proxy = cfg.tor.client.socksListenAddress; proxy = cfg.tor.client.socksListenAddress;
enforceTor = true; enforceTor = true;
always-use-proxy = true; always-use-proxy = true;