From 71f9b06d28a519f5402a4e3e660eaa7423b24c2d Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Tue, 19 Apr 2022 14:08:02 +0200
Subject: [PATCH] Tor improvements for bitcoin cookbook

---
 site-cookbooks/kosmos-bitcoin/recipes/lnd.rb         | 6 ++----
 site-cookbooks/kosmos-bitcoin/templates/lnd.conf.erb | 8 ++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/site-cookbooks/kosmos-bitcoin/recipes/lnd.rb b/site-cookbooks/kosmos-bitcoin/recipes/lnd.rb
index b3776bc..a6d932c 100644
--- a/site-cookbooks/kosmos-bitcoin/recipes/lnd.rb
+++ b/site-cookbooks/kosmos-bitcoin/recipes/lnd.rb
@@ -62,6 +62,7 @@ template "#{lnd_dir}/lnd.conf" do
             lnd_feerate: node['lnd']['feerate'],
             lnd_dir: lnd_dir,
             auto_unlock: node['lnd']['auto_unlock'],
+            tor_enabled: node['bitcoin']['tor_enabled'],
             bitcoin_datadir: node['bitcoin']['datadir'],
             bitcoin_rpc_user: node['bitcoin']['conf']['rpcuser'],
             bitcoin_rpc_password: bitcoin_credentials["rpcpassword"],
@@ -71,9 +72,6 @@ template "#{lnd_dir}/lnd.conf" do
   notifies :restart, "systemd_unit[lnd.service]", :delayed
 end
 
-exec_flags = ""
-exec_flags += "--tor.active --tor.v3" if node['bitcoin']['tor_enabled']
-
 systemd_unit 'lnd.service' do
   content({
     Unit: {
@@ -86,7 +84,7 @@ systemd_unit 'lnd.service' do
       User: bitcoin_user,
       Group: bitcoin_group,
       Type: 'simple',
-      ExecStart: "/opt/go/bin/lnd #{exec_flags}",
+      ExecStart: "/opt/go/bin/lnd",
       Restart: 'always',
       RestartSec: '30',
       TimeoutSec: '240',
diff --git a/site-cookbooks/kosmos-bitcoin/templates/lnd.conf.erb b/site-cookbooks/kosmos-bitcoin/templates/lnd.conf.erb
index 57c7caf..45b6b9e 100644
--- a/site-cookbooks/kosmos-bitcoin/templates/lnd.conf.erb
+++ b/site-cookbooks/kosmos-bitcoin/templates/lnd.conf.erb
@@ -25,3 +25,11 @@ bitcoind.rpcuser=<%= @bitcoin_rpc_user %>
 bitcoind.rpcpass=<%= @bitcoin_rpc_password %>
 bitcoind.zmqpubrawblock=<%= @bitcoin_zmqpubrawblock %>
 bitcoind.zmqpubrawtx=<%= @bitcoin_zmqpubrawtx %>
+
+<% if @tor_enabled %>
+[tor]
+tor.active=true
+tor.v3=true
+tor.streamisolation=false
+tor.skip-proxy-for-clearnet-targets=true
+<% end %>