highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-09-29 04:52:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

master merge

Browse Source
This commit is contained in:
rootzoll
2019-02-09 14:24:42 +01:00
parent 711a3bdcab b0661da108
commit 89f833b353
7 changed files with 118 additions and 121 deletions
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 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 ***"
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!"
# *** RASPIBLITZ IMAGE READY *** # *** RASPIBLITZ IMAGE READY ***
echo "" echo ""
echo "**********************************************" echo "**********************************************"

20
home.admin/40addHDD.sh
View File

@@ -42,19 +42,23 @@ if [ ${existsHDD} -gt 0 ]; then
sudo mount -a sudo mount -a
mountOK=$(df | grep -c /mnt/hdd) mountOK=$(df | grep -c /mnt/hdd)
if [ ${mountOK} -eq 1 ]; then if [ ${mountOK} -eq 1 ]; then
echo "OK - HDD is mounted" echo "OK - HDD is mounted"
echo "" echo ""
# init the RASPIBLITZ Config # init the RASPIBLITZ Config
source /home/admin/_version.info
configFile="/mnt/hdd/raspiblitz.conf" configFile="/mnt/hdd/raspiblitz.conf"
sudo touch $configFile configExists=$(sudo ls ${configFile} | grep -c 'raspiblitz.conf')
sudo chmod 777 ${configFile} if [ ${configExists} -eq 0 ]; then
echo "# RASPIBLITZ CONFIG FILE" > $configFile source /home/admin/_version.info
echo "raspiBlitzVersion='${codeVersion}'" >> $configFile sudo touch $configFile
echo "network=${network}" >> $configFile sudo chmod 777 ${configFile}
echo "chain=${chain}" >> $configFile echo "# RASPIBLITZ CONFIG FILE" > $configFile
echo "hostname=${hostname}" >> $configFile echo "raspiBlitzVersion='${codeVersion}'" >> $configFile
echo "network=${network}" >> $configFile
echo "chain=${chain}" >> $configFile
echo "hostname=${hostname}" >> $configFile
fi
# move SSH pub keys to HDD so that they survive an update # move SSH pub keys to HDD so that they survive an update
echo "moving SSH pub keys to HDD" echo "moving SSH pub keys to HDD"

2
home.admin/90finishSetup.sh
View File

@@ -87,4 +87,4 @@ sudo apt-get update
echo "OK - System is now up to date" echo "OK - System is now up to date"
# mark setup is done # mark setup is done
sudo sed -i "s/^setupStep=.*/setupStep=90/g" /home/admin/raspiblitz.info sudo sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info

2
home.admin/95finalSetup.sh
View File

@@ -29,7 +29,7 @@ cp $logFile /home/admin/raspiblitz.setup.log
echo "Setting the Name/Alias/Hostname .." echo "Setting the Name/Alias/Hostname .."
sudo /home/admin/config.scripts/lnd.setname.sh ${hostname} sudo /home/admin/config.scripts/lnd.setname.sh ${hostname}
# mark setup is done (100%) # mark setup is done
sudo sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info sudo sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info
clear clear

4
home.admin/_bootstrap.sh
View File

@@ -51,7 +51,9 @@ echo "message=" >> $infoFile
echo "network=${network}" >> $infoFile echo "network=${network}" >> $infoFile
echo "chain=${chain}" >> $infoFile echo "chain=${chain}" >> $infoFile
echo "setupStep=${setupStep}" >> $infoFile echo "setupStep=${setupStep}" >> $infoFile
echo "hostname=${hostname}" >> $infoFile if [ "${setupStep}" != "100" ]; then
echo "hostname=${hostname}" >> $infoFile
fi
sudo chmod 777 ${infoFile} sudo chmod 777 ${infoFile}
################################ ################################

4
home.admin/config.scripts/bonus.rtl.sh
View File

@@ -46,7 +46,9 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
echo "*** Get the RTL Source Code ***" echo "*** Get the RTL Source Code ***"
git clone https://github.com/ShahanaFarooqui/RTL.git git clone https://github.com/ShahanaFarooqui/RTL.git
cd RTL cd RTL
git reset --hard v0.1.13-alpha #git reset --hard v0.1.13-alpha
git reset --hard v0.1.14-alpha
# install # install
echo "*** Run: npm install ***" echo "*** Run: npm install ***"

191
home.admin/config.scripts/internet.tor.sh
View File

@@ -56,24 +56,61 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
echo "" echo ""
fi fi
echo "*** Updating System ***" # check if TOR package is installed
sudo apt-get update packageInstalled=$(dpkg -s tor-arm | grep -c 'Status: install ok')
echo "" if [ ${packageInstalled} -eq 0 ]; then
echo "*** Install Tor ***" # Prepare for TOR service
sudo apt install tor tor-arm -y echo "*** Install TOR repo keys ***"
echo "" recvKeyResult=$(sudo gpg --keyserver keys.gnupg.net --recv 886DDD89 2>&1)
echo "*** Tor Config ***" echo "${recvKeyResult}"
sudo rm -r -f /mnt/hdd/tor 2>/dev/null recvKeyFailed=$(echo "${recvKeyResult}" | grep -c 'Total number processed: 0')
sudo mkdir /mnt/hdd/tor if [ ${recvKeyFailed} -eq 1 ]; then
sudo mkdir /mnt/hdd/tor/sys echo "FAILED: sudo gpg --keyserver keys.gnupg.net --recv 886DDD89"
sudo mkdir /mnt/hdd/tor/web80 exit 1
sudo mkdir /mnt/hdd/tor/lnd9735 fi
sudo mkdir /mnt/hdd/tor/lndrpc9735 sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
sudo chmod -R 700 /mnt/hdd/tor echo ""
sudo chown -R bitcoin:bitcoin /mnt/hdd/tor
cat > ./torrc <<EOF 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 ***"
sudo apt-get update
echo ""
echo "*** Installing dirmngr ***"
sudo apt install dirmngr -y
echo ""
echo "*** Install Tor ***"
sudo apt install tor tor-arm -y
echo ""
echo "*** Tor Config ***"
#sudo rm -r -f /mnt/hdd/tor 2>/dev/null
sudo mkdir /mnt/hdd/tor 2>/dev/null
sudo mkdir /mnt/hdd/tor/sys 2>/dev/null
sudo mkdir /mnt/hdd/tor/web80 2>/dev/null
sudo mkdir /mnt/hdd/tor/lnd9735 2>/dev/null
sudo mkdir /mnt/hdd/tor/lndrpc9735 2>/dev/null
sudo chmod -R 700 /mnt/hdd/tor
sudo chown -R bitcoin:bitcoin /mnt/hdd/tor
cat > ./torrc <<EOF
### See 'man tor', or https://www.torproject.org/docs/tor-manual.html ### See 'man tor', or https://www.torproject.org/docs/tor-manual.html
DataDirectory /mnt/hdd/tor/sys DataDirectory /mnt/hdd/tor/sys
@@ -111,94 +148,62 @@ HiddenServicePort 9735 127.0.0.1:9735
# NOTE: bitcoind get tor service automatically - see /mnt/hdd/bitcoin for onion key # NOTE: bitcoind get tor service automatically - see /mnt/hdd/bitcoin for onion key
EOF EOF
sudo rm $torrc sudo rm $torrc
sudo mv ./torrc $torrc sudo mv ./torrc $torrc
sudo chmod 644 $torrc sudo chmod 644 $torrc
sudo chown -R bitcoin:bitcoin /var/run/tor/ sudo chown -R bitcoin:bitcoin /var/run/tor/
echo "" echo ""
# NYX - Tor monitor tool # NYX - Tor monitor tool
# https://nyx.torproject.org/#home # https://nyx.torproject.org/#home
echo "*** Installing NYX - TOR monitoring Tool ***" echo "*** Installing NYX - TOR monitoring Tool ***"
nyxInstalled=$(sudo pip list 2>/dev/null | grep 'nyx' -c) nyxInstalled=$(sudo pip list 2>/dev/null | grep 'nyx' -c)
if [ ${nyxInstalled} -eq 0 ]; then if [ ${nyxInstalled} -eq 0 ]; then
sudo pip install nyx sudo pip install nyx
else else
echo "NYX already installed" echo "NYX already installed"
fi fi
echo "" echo ""
echo "*** Activating TOR system service ***" echo "*** Activating TOR system service ***"
echo "ReadWriteDirectories=-/mnt/hdd/tor" | sudo tee -a /lib/systemd/system/tor@default.service echo "ReadWriteDirectories=-/mnt/hdd/tor" | sudo tee -a /lib/systemd/system/tor@default.service
sudo systemctl daemon-reload sudo systemctl daemon-reload
sudo systemctl enable tor@default sudo systemctl enable tor@default
echo "" echo ""
#echo "*** Waiting for TOR to boostrap ***" echo "*** Changing ${network} Config ***"
#torIsBootstrapped=0 networkIsTor=$(sudo cat /home/bitcoin/.${network}/${network}.conf | grep 'onlynet=onion' -c)
#while [ ${torIsBootstrapped} -eq 0 ] if [ ${networkIsTor} -eq 0 ]; then
#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 ***" echo "Only Connect thru TOR"
networkIsTor=$(sudo cat /home/bitcoin/.${network}/${network}.conf | grep 'onlynet=onion' -c) echo "onlynet=onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
if [ ${networkIsTor} -eq 0 ]; then
echo "Only Connect thru TOR" if [ "${network}" = "bitcoin" ]; then
echo "onlynet=onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf echo "Adding some bitcoin onion nodes to connect to"
echo "addnode=fno4aakpl6sg6y47.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
echo "addnode=toguvy5upyuctudx.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
echo "addnode=ndndword5lpb7eex.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
echo "addnode=6m2iqgnqjxh7ulyk.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
echo "addnode=5tuxetn7tar3q5kp.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
fi
if [ "${network}" = "bitcoin" ]; then sudo cp /home/bitcoin/.${network}/${network}.conf /home/admin/.${network}/${network}.conf
echo "Adding some bitcoin onion nodes to connect to" sudo chown admin:admin /home/admin/.${network}/${network}.conf
echo "addnode=fno4aakpl6sg6y47.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
echo "addnode=toguvy5upyuctudx.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf else
echo "addnode=ndndword5lpb7eex.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf echo "Chain network already configured for TOR"
echo "addnode=6m2iqgnqjxh7ulyk.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
echo "addnode=5tuxetn7tar3q5kp.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
fi fi
sudo cp /home/bitcoin/.${network}/${network}.conf /home/admin/.${network}/${network}.conf
sudo chown admin:admin /home/admin/.${network}/${network}.conf
else else
echo "Chain network already configured for TOR"
echo "TOR package/service is installed and was prepared earlier .. just activating again"
echo "*** Enable TOR service ***"
sudo systemctl ensable tor@default
echo ""
fi 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 # ACTIVATE LND OVER TOR
echo "*** Putting LND behind TOR ***" echo "*** Putting LND behind TOR ***"