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

Merge pull request #3663 from rootzoll/dev

Browse source 
merge dev for 1.9.9rc2 release
This commit is contained in:
/rootzoll 2023-02-07 21:43:50 +01:00 • committed by GitHub
commit 61d84abbd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home.admin/00settingsMenuBasics.sh
View file

@ -185,8 +185,8 @@ if [ ${check} -eq 1 ]; then choice="on"; fi
if [ "${blitzapi}" != "${choice}" ]; then
echo "Blitz API + webUI settings changed .."
anychange=1
sudo /home/admin/config.scripts/blitz.web.api.sh ${choice}
sudo /home/admin/config.scripts/blitz.web.ui.sh ${choice}
sudo /home/admin/config.scripts/blitz.web.api.sh ${choice} DEFAULT
sudo /home/admin/config.scripts/blitz.web.ui.sh ${choice} DEFAULT
errorOnInstall=$?
if [ "${choice}" = "on" ]; then
whiptail --title " Installed Blitz API + webUI" --msgbox "\

3
home.admin/_provision.update.sh
View file

@ -146,6 +146,9 @@ else
echo "WARN: /mnt/hdd/bitcoin/bitcoin.conf not found" >> ${logFile}
fi
# delete old Tor v1 addresses from config - see: https://github.com/rootzoll/raspiblitz/issues/3659
sed -i -E "/^addnode=[a-z0-9]{8,18}\.onion/d" /mnt/hdd/${network}/${network}.conf 2>/dev/null
echo "Version Code: ${codeVersion}" >> ${logFile}
echo "Version Data: ${raspiBlitzVersion}" >> ${logFile}

2
home.admin/_version.info
View file

@ -1,3 +1,3 @@
# RaspiBlitz Version - always [major].[main].[sub] (sub can be a string like '2rc1')
codeVersion="1.9.0rc1"
codeVersion="1.9.0rc2"
# keep last line with comment

23
home.admin/config.scripts/bonus.btcpayserver.sh
View file

@ -3,7 +3,7 @@
# Based on: https://gist.github.com/normandmickey/3f10fc077d15345fb469034e3697d0d0
# https://github.com/dgarage/NBXplorer/tags
NBXplorerVersion="v2.3.58"
NBXplorerVersion="v2.3.59"
# https://github.com/btcpayserver/btcpayserver/releases
BTCPayVersion="v1.7.5"
@ -399,10 +399,7 @@ if [ "$1" = "install" ]; then
sudo -u btcpay /home/admin/config.scripts/blitz.git-verify.sh "${PGPsigner}" "${PGPpubkeyLink}" "${PGPpubkeyFingerprint}" || exit 1
echo "# Build NBXplorer $NBXplorerVersion"
# from the build.sh with path
sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release NBXplorer/NBXplorer.csproj || (
echo "# Build failed"
exit 1
)
sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release NBXplorer/NBXplorer.csproj || exit 1
# BTCPayServer
echo "# Install BTCPayServer"
@ -423,10 +420,7 @@ if [ "$1" = "install" ]; then
echo "# Build BTCPayServer $BTCPayVersion"
# from the build.sh with path
sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release \
/home/btcpay/btcpayserver/BTCPayServer/BTCPayServer.csproj || (
echo "# Build failed"
exit 1
)
/home/btcpay/btcpayserver/BTCPayServer/BTCPayServer.csproj || exit 1
exit 0
fi
@ -757,10 +751,8 @@ if [ "$1" = "update" ]; then
echo "# Build NBXplorer $TAG"
# from the build.sh with path
sudo systemctl stop nbxplorer
sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release NBXplorer/NBXplorer.csproj || (
echo "# Build failed"
exit 1
)
sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release NBXplorer/NBXplorer.csproj || exit 1
# whitelist localhost in bitcoind
if ! sudo grep -Eq "^whitelist=127.0.0.1" /mnt/hdd/bitcoin/bitcoin.conf; then
echo "whitelist=127.0.0.1" | sudo tee -a /mnt/hdd/bitcoin/bitcoin.conf
@ -813,10 +805,7 @@ if [ "$1" = "update" ]; then
echo "# Build BTCPayServer $TAG"
# from the build.sh with path
sudo systemctl stop btcpayserver
sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release /home/btcpay/btcpayserver/BTCPayServer/BTCPayServer.csproj || (
echo "# Build failed"
exit 1
)
sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release /home/btcpay/btcpayserver/BTCPayServer/BTCPayServer.csproj || exit 1
sudo systemctl start btcpayserver
echo "# Updated BTCPayServer to $TAG"
fi

4
home.admin/config.scripts/bonus.fulcrum.sh
View file

@ -52,10 +52,10 @@ if [ "$1" = on ]; then
curl https://raw.githubusercontent.com/Electron-Cash/keys-n-hashes/master/pubkeys/calinkey.txt | sudo -u fulcrum gpg --import
# look for 'Good signature'
sudo -u fulcrum gpg --verify Fulcrum-${fulcrumVersion}-${build}.tar.gz.asc || (echo "Failed to verify the GPG signature of Fulcrum-${fulcrumVersion}-${build}.tar.gz"; exit 1)
sudo -u fulcrum gpg --verify Fulcrum-${fulcrumVersion}-${build}.tar.gz.asc || exit 1
# look for 'OK'
sudo -u fulcrum sha256sum -c Fulcrum-${fulcrumVersion}-${build}.tar.gz.sha256sum --ignore-missing || (echo "Failed to verify the sha256 hash of Fulcrum-${fulcrumVersion}-${build}.tar.gz"; exit 1)
sudo -u fulcrum sha256sum -c Fulcrum-${fulcrumVersion}-${build}.tar.gz.sha256sum --ignore-missing || exit 1
# decompress
sudo -u fulcrum tar -xvf Fulcrum-${fulcrumVersion}-${build}.tar.gz

2
home.admin/config.scripts/cl-plugin.cln-grpc.sh
View file

@ -114,7 +114,7 @@ elif [ "$1" = off ]; then
elif [ "$1" = update ]; then
if [ "$(echo "$@" | grep -c source)" -gt 0 ];then
cd /home/bitcoin/lightning/ || (echo " The source is not present"; exit 1)
cd /home/bitcoin/lightning/ || exit 1
sudo -u bitcoin git pull
fi
sudo rm -rf /home/bitcoin/cl-plugins-available/cln-grpc

2
home.admin/config.scripts/cl.hsmtool.sh
View file

@ -156,7 +156,7 @@ function decryptHSMsecret() {
/home/admin/config.scripts/cl.hsmtool.sh unlock ${CHAIN}
# attempt to decrypt again
sudo cat $passwordFile | sudo -u bitcoin lightning-hsmtool decrypt \
"$hsmSecretPath" || (echo "# Couldn't decrypt"; exit 1)
"$hsmSecretPath" || exit 1
fi
fi
shredPasswordFile