From 0cc8caa737a6ac345af147d68f06cfa9d6bba262 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 29 Oct 2020 21:20:26 +0100
Subject: [PATCH] lnd: only set tor.active on enforceTor

This also enables the test scenario 'netnsRegtest' introduced in a
later commit by fixing the following bug:
For unknown reasons, when tor.active=true and tor is not running, lnd
fails with a tor connection error on netns-isolation, but runs fine
without netns-isolation.
---
 modules/lnd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/lnd.nix b/modules/lnd.nix
index c60dfa9..143af5e 100644
--- a/modules/lnd.nix
+++ b/modules/lnd.nix
@@ -25,7 +25,7 @@ let
     bitcoin.active=1
     bitcoin.node=bitcoind
 
-    tor.active=true
+    ${optionalString (cfg.enforceTor) "tor.active=true"}
     ${optionalString (cfg.tor-socks != null) "tor.socks=${cfg.tor-socks}"}
 
     bitcoind.rpchost=${bitcoindRpcAddress}:${toString bitcoind.rpc.port}