mirror of
https://github.com/rootzoll/raspiblitz.git
synced 2025-02-28 16:58:03 +01:00
Fatpack external (#3743)
* cln: use default normal feerate to withdraw all * Bugfix: bad subsititution (#3668) Fix for error: /home/admin/config.scripts/bonus.go.sh: line 31: ${goOSversion{}: bad substitution * whiptail one line * fix syntax * lnproxy: fix api access through nginx (#3671) * lnproxy: fix api access through nginx * fix tor config and fit the menu * add to the menu and provision * merge #3682 * cln update to v23.02, backup-plugin update, add poetry (#3684) * cln backup-plugin update, add poetry * fix mkdir error, remove commented code, fmt #3677 * poetry and path fixes * add terminal feedback, format #3676 * detect the full name of the plugin * install pyln-client tqdm with pip * git-verify: add --keyid-format LONG to recognise if the signing key is not the main key * cln update to v23.02 * cln-grpc: add protobuf-compiler dep * rtl update to v0.13.6 and formatting * C-lightningREST update to v0.10.1 * CLN FAQ update (#3666) * improve the detection of existing cln aliases * add the emergencyrecover instructions to CLN FAQ * update help entries * Update Tallycoin to version 1.8.0 (#3693) * add tallycoin update info to CHANGES * Fix typo in README.md (#3699) excepted -> accepted * #3694 add LCD info * #3664 att timeout 30s to ln monitor calls (#3665) * fix setting LND_REST_ENDPOINT (#3689) * btcpay update v1.8.2, postgres database fix (#3697) * btcpay update v1.8.0, postgres database fix * btcpayserver update to v1.8.2 * update lnbits to 0.10.2 and use poetry instead of venv (#3703) * fix apt update Key error for influx repo (#3711) Co-authored-by: Patrick Scheich <patrick.scheich@syscovery.de> * fix missing timeout value for nc cmnd (#3712) Co-authored-by: Patrick Scheich <patrick.scheich@syscovery.de> * #3706 Update CLN v23.02.2 (#3716) * used patched/rolledback 23.02.2 release * check rusty sig * fix typo * fix default lightning setting * #3683 Update LIT to 0.8.6 (#3717) * update LIT to 0.8.6 * activate lnd rpcmiddleware * CHANGES.md * #3667 change all up/download from sftp tp scp (#3718) * #3722 add no hostkeys available detection (#3723) * #1186 FinTS/HBCI interface (#3704) * #1186 FinTS install script first draft * only start app when blitz is ready * improve menu * improve dit lnbits config * preserve edit * improve edit * improve edit * fix insertion * dont use fingerprint * now use main repo * add port * show local ip * fix typo * show port SSL * Update bonus.lndg.sh (#3725) * Update bonus.lndg.sh Changes version to v1.6.0. Fixes update menu bug. Cleans up code a bit (removes tabs and changes to spaces to match raspiblitz formats). * Update bonus.lndg.sh Cleaned up code, added requirements.txt install to updates (needed for this update, may be needed in future). * #3725 update lndg version in CHANGES * #3692 update lnd to v0.16.0-beta (#3732) * update SD CARD base image info * Clenaup CHANGES info * RTL install fix (#3739) * c-lightning-REST update to 0.10.2, fmt * rtl: npm insatll with --legacy-peer-deps * purge c-lightning-REST as well with RTL * jam update to v0.1.5 (#3736) * 3733 CLN GRPC > JRPC (#3741) * change exit code * change to cln_jrpc * deactivate the cln_grpc settings * set v1.9.0rc3 version * improve git verify * move fatpack into external script --------- Co-authored-by: openoms <oms@tuta.io> Co-authored-by: Metallicc <72348+metallicc@users.noreply.github.com> Co-authored-by: openoms <43343391+openoms@users.noreply.github.com> Co-authored-by: DJ Booth <djbooth007@gmail.com> Co-authored-by: Yuck Fou <115867254+YuckFouBTC@users.noreply.github.com> Co-authored-by: dni ⚡ <office@dnilabs.com> Co-authored-by: PatrickScheich <50054697+PatrickScheich@users.noreply.github.com> Co-authored-by: Patrick Scheich <patrick.scheich@syscovery.de> Co-authored-by: allyourbankarebelongtous <100060902+allyourbankarebelongtous@users.noreply.github.com>
This commit is contained in:
parent
1a0c4fe09a
commit
bec03c8566
4 changed files with 80 additions and 49 deletions
|
@ -796,55 +796,8 @@ echo "Provisioning BLITZ WEB SERVICE"
|
|||
|
||||
# *** FATPACK *** (can be activated by parameter - see details at start of script)
|
||||
if ${fatpack}; then
|
||||
echo -e "\n*** FATPACK ***"
|
||||
|
||||
echo "* Adding nodeJS Framework ..."
|
||||
sudo /home/admin/config.scripts/bonus.nodejs.sh on || exit 1
|
||||
|
||||
echo "* Optional Packages (may be needed for extended features)"
|
||||
apt_install qrencode secure-delete fbi msmtp unclutter xterm python3-pyqt5 xfonts-terminus apache2-utils nginx python3-jinja2 socat libatlas-base-dev hexyl autossh
|
||||
|
||||
echo "* Adding LND ..."
|
||||
/home/admin/config.scripts/lnd.install.sh install || exit 1
|
||||
|
||||
echo "* Adding Core Lightning ..."
|
||||
/home/admin/config.scripts/cl.install.sh install || exit 1
|
||||
echo "* Adding the cln-grpc plugin ..."
|
||||
/home/admin/config.scripts/cl-plugin.cln-grpc.sh install || exit 1
|
||||
|
||||
# *** AUTO UPDATE FALLBACK NODE LIST FROM INTERNET (only in fatpack)
|
||||
echo "*** FALLBACK NODE LIST ***"
|
||||
# see https://github.com/rootzoll/raspiblitz/issues/1888
|
||||
sudo -u admin curl -H "Accept: application/json; indent=4" https://bitnodes.io/api/v1/snapshots/latest/ -o /home/admin/fallback.bitnodes.nodes
|
||||
# Fallback Nodes List from Bitcoin Core
|
||||
sudo -u admin curl https://raw.githubusercontent.com/bitcoin/bitcoin/master/contrib/seeds/nodes_main.txt -o /home/admin/fallback.bitcoin.nodes
|
||||
|
||||
echo "* Adding Code&Compile for WEBUI-APP: LNBITS"
|
||||
/home/admin/config.scripts/bonus.lnbits.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: JAM"
|
||||
/home/admin/config.scripts/bonus.jam.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: BTCPAYSERVER"
|
||||
/home/admin/config.scripts/bonus.btcpayserver.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: RTL"
|
||||
/home/admin/config.scripts/bonus.rtl.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: THUNDERHUB"
|
||||
/home/admin/config.scripts/bonus.thunderhub.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: BTC RPC EXPLORER"
|
||||
/home/admin/config.scripts/bonus.btc-rpc-explorer.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: MEMPOOL"
|
||||
/home/admin/config.scripts/bonus.mempool.sh install || exit 1
|
||||
|
||||
echo "* Adding Raspiblitz API ..."
|
||||
sudo /home/admin/config.scripts/blitz.web.api.sh on "${defaultAPIuser}" "${defaultAPIrepo}" "blitz-${branch}" || exit 1
|
||||
echo "* Adding Raspiblitz WebUI ..."
|
||||
sudo /home/admin/config.scripts/blitz.web.ui.sh on "${defaultWEBUIuser}" "${defaultWEBUIrepo}" "release/${branch}" || exit 1
|
||||
|
||||
# set build code as new default
|
||||
sudo rm -r /home/admin/assets/nginx/www_public
|
||||
sudo cp -a /home/blitzapi/blitz_web/build/* /home/admin/assets/nginx/www_public
|
||||
sudo chown admin:admin /home/admin/assets/nginx/www_public
|
||||
sudo rm -r /home/blitzapi/blitz_web/build/*
|
||||
|
||||
echo "* FATPACK activated"
|
||||
/home/admin/config.scripts/blitz.fatpack.sh || exit 1
|
||||
else
|
||||
echo "* skipping FATPACK"
|
||||
fi
|
||||
|
|
|
@ -150,6 +150,15 @@ function release() {
|
|||
fi
|
||||
}
|
||||
|
||||
# command: fatpack
|
||||
function fatpack() {
|
||||
echo "Command to be called only on a fresh stopped minimal build to re-pack installs."
|
||||
confirmMsg fatpack
|
||||
if [ $confirm -eq 1 ]; then
|
||||
sudo /home/admin/config.scripts/blitz.fatpack.sh
|
||||
fi
|
||||
}
|
||||
|
||||
# command: debug
|
||||
function debug() {
|
||||
clear
|
||||
|
|
57
home.admin/config.scripts/blitz.fatpack.sh
Executable file
57
home.admin/config.scripts/blitz.fatpack.sh
Executable file
|
@ -0,0 +1,57 @@
|
|||
#!/bin/bash
|
||||
# setup script - to be called by build_sdcard.sh or on a stopped minimal build sd card image
|
||||
|
||||
echo -e "\n*** FATPACK ***"
|
||||
|
||||
# check if su
|
||||
if [ "$EUID" -ne 0 ]
|
||||
then echo "Please run as root (with sudo)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "* Adding nodeJS Framework ..."
|
||||
/home/admin/config.scripts/bonus.nodejs.sh on || exit 1
|
||||
|
||||
echo "* Optional Packages (may be needed for extended features)"
|
||||
apt_install qrencode secure-delete fbi msmtp unclutter xterm python3-pyqt5 xfonts-terminus apache2-utils nginx python3-jinja2 socat libatlas-base-dev hexyl autossh
|
||||
|
||||
echo "* Adding LND ..."
|
||||
/home/admin/config.scripts/lnd.install.sh install || exit 1
|
||||
|
||||
echo "* Adding Core Lightning ..."
|
||||
/home/admin/config.scripts/cl.install.sh install || exit 1
|
||||
echo "* Adding the cln-grpc plugin ..."
|
||||
/home/admin/config.scripts/cl-plugin.cln-grpc.sh install || exit 1
|
||||
|
||||
# *** AUTO UPDATE FALLBACK NODE LIST FROM INTERNET (only in fatpack)
|
||||
echo "*** FALLBACK NODE LIST ***"
|
||||
# see https://github.com/rootzoll/raspiblitz/issues/1888
|
||||
sudo -u admin curl -H "Accept: application/json; indent=4" https://bitnodes.io/api/v1/snapshots/latest/ -o /home/admin/fallback.bitnodes.nodes
|
||||
# Fallback Nodes List from Bitcoin Core
|
||||
sudo -u admin curl https://raw.githubusercontent.com/bitcoin/bitcoin/master/contrib/seeds/nodes_main.txt -o /home/admin/fallback.bitcoin.nodes
|
||||
|
||||
echo "* Adding Code&Compile for WEBUI-APP: LNBITS"
|
||||
/home/admin/config.scripts/bonus.lnbits.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: JAM"
|
||||
/home/admin/config.scripts/bonus.jam.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: BTCPAYSERVER"
|
||||
/home/admin/config.scripts/bonus.btcpayserver.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: RTL"
|
||||
/home/admin/config.scripts/bonus.rtl.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: THUNDERHUB"
|
||||
/home/admin/config.scripts/bonus.thunderhub.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: BTC RPC EXPLORER"
|
||||
/home/admin/config.scripts/bonus.btc-rpc-explorer.sh install || exit 1
|
||||
echo "* Adding Code&Compile for WEBUI-APP: MEMPOOL"
|
||||
/home/admin/config.scripts/bonus.mempool.sh install || exit 1
|
||||
|
||||
echo "* Adding Raspiblitz API ..."
|
||||
sudo /home/admin/config.scripts/blitz.web.api.sh on "${defaultAPIuser}" "${defaultAPIrepo}" "blitz-${branch}" || exit 1
|
||||
echo "* Adding Raspiblitz WebUI ..."
|
||||
sudo /home/admin/config.scripts/blitz.web.ui.sh on "${defaultWEBUIuser}" "${defaultWEBUIrepo}" "release/${branch}" || exit 1
|
||||
|
||||
# set build code as new www default
|
||||
sudo rm -r /home/admin/assets/nginx/www_public
|
||||
sudo cp -a /home/blitzapi/blitz_web/build/* /home/admin/assets/nginx/www_public
|
||||
sudo chown admin:admin /home/admin/assets/nginx/www_public
|
||||
sudo rm -r /home/blitzapi/blitz_web/build/*
|
|
@ -31,6 +31,18 @@ PGPpubkeyLink="$2"
|
|||
PGPpubkeyFingerprint="$3"
|
||||
|
||||
wget -O /var/cache/raspiblitz/pgp_keys_${PGPsigner}.asc "${PGPpubkeyLink}"
|
||||
|
||||
# in the case the wget above fails, try to use curl instead
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "# WARNING --> wget failed to download the PGP key, trying curl instead" >&2
|
||||
curl -o /var/cache/raspiblitz/pgp_keys_${PGPsigner}.asc "${PGPpubkeyLink}"
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "# ERROR --> curl failed to download the PGP key" >&2
|
||||
echo "# Exiting" >&2
|
||||
exit 6
|
||||
fi
|
||||
fi
|
||||
|
||||
gpg --import --import-options show-only /var/cache/raspiblitz/pgp_keys_${PGPsigner}.asc
|
||||
fingerprint=$(gpg --show-keys --keyid-format LONG /var/cache/raspiblitz/pgp_keys_${PGPsigner}.asc 2>/dev/null | grep "${PGPpubkeyFingerprint}" -c)
|
||||
if [ "${fingerprint}" -lt 1 ]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue