From 8e32d9c346b2572b97c2c3d9136daa26a8077fcf Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Mon, 4 Feb 2019 02:36:00 +0100
Subject: [PATCH] test TOR fix

---
 build.sdcard/raspbianStretchDesktop.sh    | 26 ++++++-------
 home.admin/config.scripts/internet.tor.sh | 46 +----------------------
 2 files changed, 15 insertions(+), 57 deletions(-)

diff --git a/build.sdcard/raspbianStretchDesktop.sh b/build.sdcard/raspbianStretchDesktop.sh
index 74516ee..1ed6d54 100644
--- a/build.sdcard/raspbianStretchDesktop.sh
+++ b/build.sdcard/raspbianStretchDesktop.sh
@@ -495,20 +495,20 @@ sudo cp ./assets/background.service /etc/systemd/system/background.service
 sudo systemctl enable background
 
 # Prepare for TOR service
-echo "*** Adding Tor Sources to sources.list ***"
-echo "deb http://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
-echo "deb-src http://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
-echo "OK"
-echo ""
-echo "*** Installing dirmngr ***"
+#echo "*** Adding Tor Sources to sources.list ***"
+#echo "deb https://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
+#echo "deb-src https://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
+#echo "OK"
+#echo ""
+#echo "*** Installing dirmngr ***"
 sudo apt install dirmngr
-echo ""
-echo "*** Fetching GPG key ***"
-sudo gpg --keyserver keys.gnupg.net --recv 886DDD89
-sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
-sudo gpg --keyserver pgpkeys.mit.edu --recv-key  74A941BA219EC810
-sudo gpg -a --export 74A941BA219EC810 | sudo apt-key add -
-echo "!!!!!! Please check if the above really worked!"
+#echo ""
+#echo "*** Fetching GPG key (for TOR install) ***"
+#sudo gpg --keyserver keys.gnupg.net --recv 886DDD89
+#sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+#sudo gpg --keyserver pgpkeys.mit.edu --recv-key  74A941BA219EC810
+#sudo gpg -a --export 74A941BA219EC810 | sudo apt-key add -
+#echo "!!!!!! Please check if the above really worked!"
 
 # *** RASPIBLITZ IMAGE READY ***
 echo ""
diff --git a/home.admin/config.scripts/internet.tor.sh b/home.admin/config.scripts/internet.tor.sh
index 9749e5b..eee1559 100755
--- a/home.admin/config.scripts/internet.tor.sh
+++ b/home.admin/config.scripts/internet.tor.sh
@@ -61,7 +61,8 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   echo ""
 
   echo "*** Install Tor ***"
-  sudo apt install tor tor-arm -y
+  sudo apt-get install tor
+  #sudo apt install tor tor-arm -y
 
   echo ""
   echo "*** Tor Config ***"
@@ -134,21 +135,6 @@ EOF
   sudo systemctl enable tor@default
   echo ""
 
-  #echo "*** Waiting for TOR to boostrap ***"
-  #torIsBootstrapped=0
-  #while [ ${torIsBootstrapped} -eq 0 ]
-  #do
-  #  echo "--- Checking 1 ---"
-  #  date +%s
-  #  sudo cat /mnt/hdd/tor/notice.log 2>/dev/null | grep "Bootstrapped" | tail -n 10
-  #  torIsBootstrapped=$(sudo cat /mnt/hdd/tor/notice.log 2>/dev/null | grep "Bootstrapped 100" -c)
-  #  echo "torIsBootstrapped(${torIsBootstrapped})"
-  #  echo "If this takes too long --> CTRL+c, reboot and check manually"
-  #  sleep 5
-  #done
-  #echo "OK - Tor Bootstrap is ready"
-  #echo ""
-
   echo "*** Changing ${network} Config ***"
   networkIsTor=$(sudo cat /home/bitcoin/.${network}/${network}.conf | grep 'onlynet=onion' -c)
   if [ ${networkIsTor} -eq 0 ]; then
@@ -172,34 +158,6 @@ EOF
     echo "Chain network already configured for TOR"
   fi
 
-  #echo "*** ${network} re-init - Waiting for Onion Address ***"
-  # restarting bitcoind to start with tor and generare onion.address
-  #echo "restarting ${network}d ..."
-  #sudo systemctl restart ${network}d
-  #sleep 8
-  #onionAddress=""
-  #while [ ${#onionAddress} -eq 0 ]
-  #do
-  #  echo "--- Checking 2 ---"
-  #  date +%s
-  #  testNetAdd=""
-  #  if [ "${chain}" = "test" ];then
-  #    testNetAdd="/testnet3"
-  #  fi
-  #  sudo cat /mnt/hdd/${network}${testNetAdd}/debug.log 2>/dev/null | grep "tor" | tail -n 10
-  #  onionAddress=$(sudo -u bitcoin ${network}-cli getnetworkinfo | grep '"address"' | cut -d '"' -f4)
-  #  echo "Can take up to 20min - if this takes longer --> CTRL+c, reboot and check manually"
-  #  sleep 5
-  #done
-  #onionPort=$(sudo -u bitcoin ${network}-cli getnetworkinfo | grep '"port"' | tr -dc '0-9')
-  #echo "Your Chain Network Onion Address is: ${onionAddress}:${onionPort}"
-  #echo ""
-
-  #echo "*** Setting your Onion Address ***"
-  #onionLND=$(sudo cat /mnt/hdd/tor/lnd9735/hostname)
-  #echo "Your Lightning Tor Onion Address is: ${onionLND}:9735"
-  #echo ""
-
   # ACTIVATE LND OVER TOR
   echo "*** Putting LND behind TOR ***"
   echo "Make sutre LND is disabled"