diff --git a/modules/clightning.nix b/modules/clightning.nix index c7438b4..e9543fb 100644 --- a/modules/clightning.nix +++ b/modules/clightning.nix @@ -50,6 +50,11 @@ in { default = null; 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 { type = types.bool; default = false; diff --git a/modules/netns-isolation.nix b/modules/netns-isolation.nix index a010425..0dc8fad 100644 --- a/modules/netns-isolation.nix +++ b/modules/netns-isolation.nix @@ -227,7 +227,7 @@ in { # clightning: Custom netns configs services.clightning = mkIf config.services.clightning.enable { 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 @@ -307,7 +307,7 @@ in { # Custom netns config option values if netns-isolation not enabled (mkIf (!cfg.enable) { # 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}"; }) ]; } diff --git a/modules/presets/secure-node.nix b/modules/presets/secure-node.nix index 1f172ba..fdf89e5 100644 --- a/modules/presets/secure-node.nix +++ b/modules/presets/secure-node.nix @@ -152,7 +152,7 @@ in { enforceTor = 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 services.lnd = {