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

clightning: add bindport option

This commit is contained in:
nixbitcoin 2020-08-04 07:35:07 +00:00
parent b6179639fe
commit d99ccc8445
No known key found for this signature in database
GPG Key ID: DD11F9AD5308B3BA
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/clightning.nix
View File

@ -50,6 +50,11 @@ in {
default = null; default = null;
description = "Set an IP address or UNIX domain socket to listen to"; description = "Set an IP address or UNIX domain socket to listen to";
}; };
bindport = mkOption {
type = types.port;
default = 9735;
description = "Set a Port to listen to locally";
};
announce-tor = mkOption { announce-tor = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;

4
modules/netns-isolation.nix
View File

@ -227,7 +227,7 @@ in {
# clightning: Custom netns configs # clightning: Custom netns configs
services.clightning = mkIf config.services.clightning.enable { services.clightning = mkIf config.services.clightning.enable {
bitcoin-rpcconnect = netns.bitcoind.address; bitcoin-rpcconnect = netns.bitcoind.address;
bind-addr = "${netns.clightning.address}:${toString config.services.clightning.onionport}"; bind-addr = "${netns.clightning.address}:${toString config.services.clightning.bindport}";
}; };
# lnd: Custom netns configs # lnd: Custom netns configs
@ -307,7 +307,7 @@ in {
# Custom netns config option values if netns-isolation not enabled # Custom netns config option values if netns-isolation not enabled
(mkIf (!cfg.enable) { (mkIf (!cfg.enable) {
# clightning # clightning
services.clightning.bind-addr = "127.0.0.1:${toString config.services.clightning.onionport}"; services.clightning.bind-addr = "127.0.0.1:${toString config.services.clightning.bindport}";
}) })
]; ];
} }

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

@ -152,7 +152,7 @@ in {
enforceTor = true; enforceTor = true;
always-use-proxy = true; always-use-proxy = true;
}; };
services.tor.hiddenServices.clightning = mkIf cfg.clightning.enable (mkHiddenService { port = cfg.clightning.onionport; toHost = (builtins.head (builtins.split ":" cfg.clightning.bind-addr)); }); services.tor.hiddenServices.clightning = mkIf cfg.clightning.enable (mkHiddenService { port = cfg.clightning.onionport; toHost = (builtins.head (builtins.split ":" cfg.clightning.bind-addr)); toPort = cfg.clightning.bindport; });
# lnd # lnd
services.lnd = { services.lnd = {