mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2025-02-25 07:07:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

moving tor install prep into config script

Browse source
This commit is contained in:
rootzoll 2019-02-04 22:32:46 +01:00
parent c775f82335
commit 19c1f0394d
2 changed files with 100 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build.sdcard/raspbianStretchDesktop.sh
View file

@ -494,22 +494,6 @@ sudo chmod +x /home/admin/_background.sh
sudo cp ./assets/background.service /etc/systemd/system/background.service sudo cp ./assets/background.service /etc/systemd/system/background.service
sudo systemctl enable background sudo systemctl enable background
# Prepare for TOR service
#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 (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 *** # *** RASPIBLITZ IMAGE READY ***
echo "" echo ""
echo "**********************************************" echo "**********************************************"

63
home.admin/config.scripts/internet.tor.sh
View file

@ -56,22 +56,58 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
echo "" echo ""
fi fi
# check if TOR package is installed
packageInstalled=$(dpkg -s tor-arm | grep -c 'Status: install ok')
if [ ${packageInstalled} -eq 0 ]; then
# Prepare for TOR service
echo "*** Install TOR repo keys ***"
recvKeyResult=$(sudo gpg --keyserver keys.gnupg.net --recv 886DDD89 2>&1)
echo "${recvKeyResult}"
recvKeyFailed=$(echo "${recvKeyResult}" | grep -c 'Total number processed: 0')
if [ ${recvKeyFailed} -eq 1 ]; then
echo "FAILED: sudo gpg --keyserver keys.gnupg.net --recv 886DDD89"
exit 1
fi
sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
echo ""
recvKeyResult=$(sudo gpg --keyserver pgpkeys.mit.edu --recv-key 74A941BA219EC810 2>&1)
echo "${recvKeyResult}"
recvKeyFailed=$(echo "${recvKeyResult}" | grep -c 'Total number processed: 0')
if [ ${recvKeyFailed} -eq 1 ]; then
echo "FAILED: sudo gpg --keyserver pgpkeys.mit.edu --recv-key 74A941BA219EC810"
exit 1
fi
sudo gpg -a --export 74A941BA219EC810 | sudo apt-key add -
echo ""
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 "*** Updating System ***" echo "*** Updating System ***"
sudo apt-get update sudo apt-get update
echo "" echo ""
echo "*** Installing dirmngr ***"
sudo apt install dirmngr -y
echo ""
echo "*** Install Tor ***" echo "*** Install Tor ***"
sudo apt-get install tor sudo apt install tor tor-arm -y
#sudo apt install tor tor-arm -y
echo "" echo ""
echo "*** Tor Config ***" echo "*** Tor Config ***"
sudo rm -r -f /mnt/hdd/tor 2>/dev/null #sudo rm -r -f /mnt/hdd/tor 2>/dev/null
sudo mkdir /mnt/hdd/tor sudo mkdir /mnt/hdd/tor 2>/dev/null
sudo mkdir /mnt/hdd/tor/sys sudo mkdir /mnt/hdd/tor/sys 2>/dev/null
sudo mkdir /mnt/hdd/tor/web80 sudo mkdir /mnt/hdd/tor/web80 2>/dev/null
sudo mkdir /mnt/hdd/tor/lnd9735 sudo mkdir /mnt/hdd/tor/lnd9735 2>/dev/null
sudo mkdir /mnt/hdd/tor/lndrpc9735 sudo mkdir /mnt/hdd/tor/lndrpc9735 2>/dev/null
sudo chmod -R 700 /mnt/hdd/tor sudo chmod -R 700 /mnt/hdd/tor
sudo chown -R bitcoin:bitcoin /mnt/hdd/tor sudo chown -R bitcoin:bitcoin /mnt/hdd/tor
cat > ./torrc <<EOF cat > ./torrc <<EOF
@ -158,6 +194,17 @@ EOF
echo "Chain network already configured for TOR" echo "Chain network already configured for TOR"
fi fi
else
echo "TOR package/service is installed and was prepared earlier .. just activating again"
echo "*** Enable TOR service ***"
sudo systemctl ensable tor@default
echo ""
fi
# ACTIVATE LND OVER TOR # ACTIVATE LND OVER TOR
echo "*** Putting LND behind TOR ***" echo "*** Putting LND behind TOR ***"
echo "Make sutre LND is disabled" echo "Make sutre LND is disabled"