highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-09-30 14:06:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1.4' of https://github.com/rootzoll/raspiblitz into v1.4

Browse Source
This commit is contained in:
rootzoll
2020-01-08 11:21:40 +01:00
parent ee7776f801 1feeee56f1
commit 13f9c13b71
4 changed files with 78 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
home.admin/_bootstrap.migration.sh
View File

@@ -85,27 +85,60 @@ if [ ${configExists} -eq 1 ]; then
# make sure to fix bitcoind RPC port if not done in old version
# https://github.com/rootzoll/raspiblitz/issues/217
settingExists=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep -c 'rpcport=')
if [ ${settingExists} -eq 0 ]; then
echo "fix issue #217 -> adding rpcport=8332" >> ${logFile}
echo "rpcport=8332" >> /mnt/hdd/bitcoin/bitcoin.conf
else
echo "check issue #217 -> ok rpcport exists" >> ${logFile}
fi
settingExists=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep -c 'rpcallowip=')
if [ ${settingExists} -eq 0 ]; then
# https://github.com/rootzoll/raspiblitz/issues/950
if ! grep -Eq "^rpcallowip=.*" /mnt/hdd/${network}/${network}.conf; then
echo "fix issue #217 -> adding rpcallowip=127.0.0.1" >> ${logFile}
echo "rpcallowip=127.0.0.1" >> /mnt/hdd/bitcoin/bitcoin.conf
echo "rpcallowip=127.0.0.1" >> /mnt/hdd/${network}/${network}.conf
else
echo "check issue #217 -> ok rpcallowip exists" >> ${logFile}
echo "check issue #217 -> ok rpcallow exists" >> ${logFile}
fi
settingExists=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep -c 'rpcbind=')
if [ ${settingExists} -eq 0 ]; then
echo "fix issue #217 -> adding rpcbind=127.0.0.1:8332" >> ${logFile}
echo "rpcbind=127.0.0.1:8332" >> /mnt/hdd/bitcoin/bitcoin.conf
# check whether "main." needs to be added to rpcport and rpcbind
if grep -Eq "^rpcport=.*" /mnt/hdd/${network}/${network}.conf; then
echo "fix issue #950 -> change rpcport to main.rpcport" >> ${logFile}
sudo sed -i -E 's/^(rpcport=.*)/main.\1/g' /mnt/hdd/${network}/${network}.conf
else
echo "check issue #217 -> ok rpcbind exists" >> ${logFile}
echo "check issue #950 -> ok ^rpcport does not exist" >> ${logFile}
fi
if grep -Eq "^rpcbind=.*" /mnt/hdd/${network}/${network}.conf; then
echo "fix issue #950 -> change rpcbind to main.rpcbind" >> ${logFile}
sudo sed -i -E 's/^(rpcbind=.*)/main.\1/g' /mnt/hdd/${network}/${network}.conf
else
echo "check issue #950 -> ok ^rpcbind does not exist" >> ${logFile}
fi
# check whether right settings are there ("main.")
if ! grep -Eq "^main.rpcport=.*" /mnt/hdd/${network}/${network}.conf; then
echo "fix issue #217 -> adding main.rpcport=8332" >> ${logFile}
echo "main.rpcport=8332" >> /mnt/hdd/${network}/${network}.conf
else
echo "check issue #217 -> ok main.rpcport exists" >> ${logFile}
fi
if ! grep -Eq "^main.rpcbind=.*" /mnt/hdd/${network}/${network}.conf; then
echo "fix issue #217 -> adding main.rpcbind=127.0.0.1:8332" >> ${logFile}
echo "main.rpcbind=127.0.0.1:8332" >> /mnt/hdd/${network}/${network}.conf
else
echo "check issue #217 -> ok main.rpcbind exists" >> ${logFile}
fi
# same for testnet
if ! grep -Eq "^test.rpcport=.*" /mnt/hdd/${network}/${network}.conf; then
echo "fix issue #950 -> adding test.rpcport=18332" >> ${logFile}
echo "test.rpcport=18332" >> /mnt/hdd/${network}/${network}.conf
else
echo "check issue #950 -> ok test.rpcport exists" >> ${logFile}
fi
if ! grep -Eq "^test.rpcbind=.*" /mnt/hdd/${network}/${network}.conf; then
echo "fix issue #950 -> adding test.rpcbind=127.0.0.1:18332" >> ${logFile}
echo "test.rpcbind=127.0.0.1:18332" >> /mnt/hdd/${network}/${network}.conf
else
echo "check issue #950 -> ok test.rpcbind exists" >> ${logFile}
fi
fi
echo "Version Code: ${codeVersion}" >> ${logFile}

4
home.admin/config.scripts/blitz.datadrive.sh
View File

@@ -49,7 +49,7 @@ fi
isMounted=$(sudo df | grep -c /mnt/hdd)
isBTRFS=$(sudo btrfs subvolume list /mnt/hdd 2>/dev/null | grep -c "WORKINGDIR")
isRaid=$(btrfs filesystem df /mnt/hdd 2>/dev/null | grep -c "Data, RAID1")
isSSD=$(sudo cat /sys/block/sda/queue/rotational | grep -c 0)
isSSD=$(sudo cat /sys/block/sda/queue/rotational 2>/dev/null | grep -c 0)
# determine if swap is external on or not
externalSwapPath="/mnt/hdd/swapfile"
@@ -1380,4 +1380,4 @@ if [ "$1" = "clean" ]; then
fi
echo "error='unkown command'"
exit 1
exit 1

21
home.admin/config.scripts/bonus.lndmanage.sh
View File

@@ -16,17 +16,22 @@ fi
# install
if [ "$1" = "1" ] || [ "$1" = "on" ]; then
if [ -d "/home/admin/lndmanage" ]; then
echo "LNDMANAGE already installed"
exit 1
fi
echo "*** INSTALL LNDMANAGE ***"
mkdir lndmanage
cd lndmanage
mkdir /home/admin/lndmanage
cd /home/admin/lndmanage
# activate virtual environment
sudo apt install -y python3-venv
python3 -m venv venv
source venv/bin/activate
python -m venv venv
source /home/admin/lndmanage/venv/bin/activate
# get dependencies
sudo apt install -y python3-dev libatlas-base-dev
pip3 install wheel
pip3 install lndmanage==0.8.0.1
python -m pip install wheel
python -m pip install lndmanage==0.8.0.1
# setting value in raspi blitz config
sudo sed -i "s/^lndmanage=.*/lndmanage=on/g" /mnt/hdd/raspiblitz.conf
@@ -52,4 +57,4 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
fi
echo "FAIL - Unknown Parameter $1"
exit 1
exit 1

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

@@ -91,22 +91,24 @@ activateBitcoinOverTOR()
if [ ${networkIsTor} -eq 0 ]; then
# clean all previous added nodes
sudo sed -i "s/^addnode=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^main.addnode=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^test.addnode=.*//g" /home/bitcoin/.${network}/${network}.conf
echo "Addding TOR config ..."
sudo chmod 777 /home/bitcoin/.${network}/${network}.conf
echo "onlynet=onion" >> /home/bitcoin/.${network}/${network}.conf
echo "proxy=127.0.0.1:9050" >> /home/bitcoin/.${network}/${network}.conf
echo "bind=127.0.0.1" >> /home/bitcoin/.${network}/${network}.conf
echo "main.bind=127.0.0.1" >> /home/bitcoin/.${network}/${network}.conf
echo "test.bind=127.0.0.1" >> /home/bitcoin/.${network}/${network}.conf
echo "dnsseed=0" >> /home/bitcoin/.${network}/${network}.conf
echo "dns=0" >> /home/bitcoin/.${network}/${network}.conf
if [ "${network}" = "bitcoin" ]; then
# adding some bitcoin onion nodes to connect to to make connection easier
echo "addnode=fno4aakpl6sg6y47.onion" >> /home/bitcoin/.${network}/${network}.conf
echo "addnode=toguvy5upyuctudx.onion" >> /home/bitcoin/.${network}/${network}.conf
echo "addnode=ndndword5lpb7eex.onion" >> /home/bitcoin/.${network}/${network}.conf
echo "addnode=6m2iqgnqjxh7ulyk.onion" >> /home/bitcoin/.${network}/${network}.conf
echo "addnode=5tuxetn7tar3q5kp.onion" >> /home/bitcoin/.${network}/${network}.conf
echo "main.addnode=fno4aakpl6sg6y47.onion" >> /home/bitcoin/.${network}/${network}.conf
echo "main.addnode=toguvy5upyuctudx.onion" >> /home/bitcoin/.${network}/${network}.conf
echo "main.addnode=ndndword5lpb7eex.onion" >> /home/bitcoin/.${network}/${network}.conf
echo "main.addnode=6m2iqgnqjxh7ulyk.onion" >> /home/bitcoin/.${network}/${network}.conf
echo "main.addnode=5tuxetn7tar3q5kp.onion" >> /home/bitcoin/.${network}/${network}.conf
fi
sudo chmod 444 /home/bitcoin/.${network}/${network}.conf
@@ -127,9 +129,11 @@ deactivateBitcoinOverTOR()
{
echo "*** Changing ${network} Config ***"
sudo sed -i "s/^onlynet=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^addnode=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^main.addnode=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^test.addnode=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^proxy=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^bind=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^main.bind=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^test.bind=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^dnsseed=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i "s/^dns=.*//g" /home/bitcoin/.${network}/${network}.conf
sudo sed -i '/^ *$/d' /home/bitcoin/.${network}/${network}.conf
@@ -229,7 +233,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
# check if TOR was already installed and is funtional
echo ""
echo "*** Check if TOR service is functional ***"
torRunning=$(curl --connect-timeout 10 --socks5-hostname 127.0.0.1:9050 https://check.torproject.org | grep "Congratulations. This browser is configured to use Tor." -c)
torRunning=$(curl --connect-timeout 10 --socks5-hostname 127.0.0.1:9050 https://check.torproject.org 2>/dev/null | grep "Congratulations. This browser is configured to use Tor." -c)
if [ ${torRunning} -gt 0 ]; then
clear
echo "You are all good - TOR is already running."