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

clightning: remove redundant option 'bitcoin-rpcconnect'

Browse Source
This commit is contained in:
Erik Arvstedt 2020-10-16 17:43:00 +02:00
parent abd32cde30
commit c24ac5d363
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/clightning.nix
View File

@ -12,7 +12,8 @@ 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"}
bind-addr=${cfg.bind-addr}:${toString cfg.bindport} bind-addr=${cfg.bind-addr}:${toString cfg.bindport}
${optionalString (cfg.bitcoin-rpcconnect != null) "bitcoin-rpcconnect=${cfg.bitcoin-rpcconnect}"} bitcoin-rpcconnect=${builtins.elemAt config.services.bitcoind.rpcbind 0}
bitcoin-rpcport=${toString config.services.bitcoind.rpc.port}
bitcoin-rpcuser=${config.services.bitcoind.rpc.users.public.name} bitcoin-rpcuser=${config.services.bitcoind.rpc.users.public.name}
rpc-file-mode=0660 rpc-file-mode=0660
${cfg.extraConfig} ${cfg.extraConfig}
@ -61,11 +62,6 @@ in {
default = false; default = false;
description = "Announce clightning Tor Hidden Service"; description = "Announce clightning Tor Hidden Service";
}; };
bitcoin-rpcconnect = mkOption {
type = types.nullOr types.str;
default = null;
description = "The bitcoind RPC host to connect to.";
};
dataDir = mkOption { dataDir = mkOption {
type = types.path; type = types.path;
default = "/var/lib/clightning"; default = "/var/lib/clightning";

5
modules/netns-isolation.nix
View File

@ -267,10 +267,7 @@ in {
}; };
systemd.services.bitcoind-import-banlist.serviceConfig.NetworkNamespacePath = "/var/run/netns/nb-bitcoind"; systemd.services.bitcoind-import-banlist.serviceConfig.NetworkNamespacePath = "/var/run/netns/nb-bitcoind";
services.clightning = { services.clightning.bind-addr = netns.clightning.address;
bitcoin-rpcconnect = netns.bitcoind.address;
bind-addr = netns.clightning.address;
};
services.lnd = { services.lnd = {
listen = netns.lnd.address; listen = netns.lnd.address;