From 716e98789c61f42c6ac082fb32ef81f4843ef4c4 Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Tue, 4 Aug 2020 07:45:02 +0000
Subject: [PATCH] lnd: add listenPort option

---
 modules/lnd.nix                 | 7 ++++++-
 modules/presets/secure-node.nix | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/lnd.nix b/modules/lnd.nix
index 1a3489f..d733632 100644
--- a/modules/lnd.nix
+++ b/modules/lnd.nix
@@ -14,7 +14,7 @@ let
     tlscertpath=${secretsDir}/lnd-cert
     tlskeypath=${secretsDir}/lnd-key
 
-    listen=${toString cfg.listen}
+    listen=${toString cfg.listen}:${toString cfg.listenPort}
     ${lib.concatMapStrings (rpclisten: "rpclisten=${rpclisten}:${toString cfg.rpcPort}\n") cfg.rpclisten}
     ${lib.concatMapStrings (restlisten: "restlisten=${restlisten}:${toString cfg.restPort}\n") cfg.restlisten}
 
@@ -51,6 +51,11 @@ in {
       default = "localhost";
       description = "Bind to given address to listen to peer connections";
     };
+    listenPort = mkOption {
+      type = types.port;
+      default = 9735;
+      description = "Bind to given port to listen to peer connections";
+    };
     rpclisten = mkOption {
       type = types.listOf types.str;
       default = [ "localhost" ];
diff --git a/modules/presets/secure-node.nix b/modules/presets/secure-node.nix
index 8c12e71..9320e08 100644
--- a/modules/presets/secure-node.nix
+++ b/modules/presets/secure-node.nix
@@ -163,7 +163,7 @@ in {
       tor-socks = cfg.tor.client.socksListenAddress;
       enforceTor = true;
     };
-    services.tor.hiddenServices.lnd = mkIf cfg.lnd.enable (mkHiddenService { port = cfg.lnd.onionport; toHost = cfg.lnd.listen; });
+    services.tor.hiddenServices.lnd = mkIf cfg.lnd.enable (mkHiddenService { port = cfg.lnd.onionport; toHost = cfg.lnd.listen; toPort = cfg.lnd.listenPort; });
 
     # lightning-loop
     services.lightning-loop = {