fixing TOR on/off

This commit is contained in:
rootzoll 2019-02-09 18:16:36 +01:00
parent fcf977826c
commit bfc2a0fa90

View file

@ -23,20 +23,11 @@ prepareTorSources()
sudo apt install dirmngr -y sudo apt install dirmngr -y
echo "" echo ""
echo "*** Adding KEYS deb.torproject.org ***"
curl https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | sudo gpg --import curl https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | sudo gpg --import
sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
echo "" 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 "*** 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 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 "deb-src https://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
@ -209,7 +200,7 @@ EOF
echo "TOR package/service is installed and was prepared earlier .. just activating again" echo "TOR package/service is installed and was prepared earlier .. just activating again"
echo "*** Enable TOR service ***" echo "*** Enable TOR service ***"
sudo systemctl ensable tor@default sudo systemctl enable tor@default
echo "" echo ""
fi fi
@ -260,17 +251,17 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
echo "OK" echo "OK"
echo "" echo ""
echo "*** Remove Tor ***" #echo "*** Remove Tor ***"
sudo apt remove tor tor-arm -y #sudo apt remove tor tor-arm -y
echo "" #echo ""
echo "*** Remove NYX ***" #echo "*** Remove NYX ***"
sudo pip uninstall nyx -y #sudo pip uninstall nyx -y
echo "" #echo ""
echo "*** Remove TOR Files/Config ***" #echo "*** Remove TOR Files/Config ***"
sudo rm -r -f /mnt/hdd/tor #sudo rm -r -f /mnt/hdd/tor
echo "" #echo ""
echo "needs reboot to activate new setting" echo "needs reboot to activate new setting"
exit 0 exit 0