From 748284a04fe7493dd7ccf8dcb50b733c845f4396 Mon Sep 17 00:00:00 2001
From: nolim1t <hello@nolim1t.co>
Date: Wed, 10 Jun 2020 21:48:18 +0700
Subject: [PATCH] Remove LND overwritten files

---
 stage2/07-configure-LND/01-run.sh             |  6 ---
 stage2/07-configure-LND/files/lnd.conf        | 38 -------------------
 .../01-run.sh                                 |  0
 .../01-run.sh                                 |  0
 .../files/torrc                               |  7 ++--
 5 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100755 stage2/07-configure-LND/01-run.sh
 delete mode 100644 stage2/07-configure-LND/files/lnd.conf
 rename stage2/{08-set-bitcoind-perms => 07-set-bitcoind-perms}/01-run.sh (100%)
 rename stage2/{09-configure-tor => 08-configure-tor}/01-run.sh (100%)
 rename stage2/{09-configure-tor => 08-configure-tor}/files/torrc (72%)

diff --git a/stage2/07-configure-LND/01-run.sh b/stage2/07-configure-LND/01-run.sh
deleted file mode 100755
index 19564b1..0000000
--- a/stage2/07-configure-LND/01-run.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-chmod 644 files/lnd.conf
-echo "Copying lnd.conf to overwrite the existing LND.conf"
-cp files/lnd.conf   ${ROOTFS_DIR}/home/${FIRST_USER_NAME}/lnd/lnd.conf
-on_chroot << EOF
-chown -R ${FIRST_USER_NAME}:${FIRST_USER_NAME} /home/${FIRST_USER_NAME}
-EOF
diff --git a/stage2/07-configure-LND/files/lnd.conf b/stage2/07-configure-LND/files/lnd.conf
deleted file mode 100644
index 242b521..0000000
--- a/stage2/07-configure-LND/files/lnd.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-[Application Options]
-
-listen=0.0.0.0:9735
-rpclisten=0.0.0.0:10009
-restlisten=0.0.0.0:8080
-maxpendingchannels=3
-minchansize=1337
-alias=Umbrel Node
-color=#5351FB
-
-; Makes routing faster but have to use images built with experimental tag
-[Routing]
-routing.assumechanvalid=1
-
-[Bitcoin]
-; If the Bitcoin chain should be active. Atm, only a single chain can be
-; active.
-bitcoin.active=1
-bitcoin.mainnet=1
-; Use neutrino for now, but maybe it could be permanent and then switch
-; to a full node once its working?
-bitcoin.node=neutrino
-bitcoin.defaultchanconfs=2
-
-; Add neutrino peers
-; TODO: umbrel to set up a neutrino peer to support umbrel nodes
-[neutrino]
-neutrino.addpeer=bb2.breez.technology
-neutrino.addpeer=mainnet1-btcd.zaphq.io
-neutrino.addpeer=mainnet2-btcd.zaphq.io
-
-[tor]
-tor.active=1
-tor.control=9051
-tor.socks=9050
-tor.v3=1
-tor.dns=soa.nodes.lightning.directory:53
-
diff --git a/stage2/08-set-bitcoind-perms/01-run.sh b/stage2/07-set-bitcoind-perms/01-run.sh
similarity index 100%
rename from stage2/08-set-bitcoind-perms/01-run.sh
rename to stage2/07-set-bitcoind-perms/01-run.sh
diff --git a/stage2/09-configure-tor/01-run.sh b/stage2/08-configure-tor/01-run.sh
similarity index 100%
rename from stage2/09-configure-tor/01-run.sh
rename to stage2/08-configure-tor/01-run.sh
diff --git a/stage2/09-configure-tor/files/torrc b/stage2/08-configure-tor/files/torrc
similarity index 72%
rename from stage2/09-configure-tor/files/torrc
rename to stage2/08-configure-tor/files/torrc
index 253df0f..d9ea535 100644
--- a/stage2/09-configure-tor/files/torrc
+++ b/stage2/08-configure-tor/files/torrc
@@ -7,8 +7,9 @@ Log debug file /var/log/tor/debug.log
 
 DataDirectory /var/lib/tor
 ControlPort 9051
-# Use password Later when lnd supports it
-#HashedControlPassword 16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C
+# Default password for umbrel tor
+HashedControlPassword 16:50A873DF18C00F4A6048BF1CEF7E7AA66478F0B5134DA4369D80657F26
+# Backwards compatibility
 CookieAuthentication 1
 
 # Allow this for now
@@ -18,5 +19,3 @@ HiddenServicePort 22 127.0.0.1:22
 
 HiddenServiceDir /var/lib/tor/web
 HiddenServicePort 80 127.0.0.1:80
-
-