From 2d63681d5daa26cb3d0111abe37180e3ad345bf0 Mon Sep 17 00:00:00 2001 From: openoms Date: Sat, 23 Jul 2022 12:34:33 +0100 Subject: [PATCH 1/6] add CLN lightning-rpc access for blitzapi --- home.admin/config.scripts/blitz.web.api.sh | 4 ++++ home.admin/config.scripts/cl.check.sh | 14 +++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/home.admin/config.scripts/blitz.web.api.sh b/home.admin/config.scripts/blitz.web.api.sh index 2a5da8bc1..602da109d 100755 --- a/home.admin/config.scripts/blitz.web.api.sh +++ b/home.admin/config.scripts/blitz.web.api.sh @@ -179,6 +179,10 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then echo "rpc-file-mode=0660" | tee -a ${CLCONF} fi /usr/sbin/usermod --append --groups bitcoin blitzapi + # symlink the CLN data dir for blitzapi + sudo rm -rf /home/blitzapi/.lightning # not a symlink.. delete it silently + # create symlink + sudo - u blitzapi ln -s /mnt/hdd/app-data/.lightning /home/blitzapi/ cd /home/blitzapi || exit 1 # git clone https://github.com/fusion44/blitz_api.git /home/blitzapi/blitz_api diff --git a/home.admin/config.scripts/cl.check.sh b/home.admin/config.scripts/cl.check.sh index 027ff8706..3894a3748 100644 --- a/home.admin/config.scripts/cl.check.sh +++ b/home.admin/config.scripts/cl.check.sh @@ -67,15 +67,11 @@ if [ $(grep -c "^feeadjuster" < ${CLCONF}) -gt 0 ];then fi fi -if [ "${LNBitsFunding}" = "${netprefix}cl" ]; then - # https://github.com/rootzoll/raspiblitz/issues/3007 - if [ $(grep -c "^rpc-file-mode=0660" < ${CLCONF}) -eq 0 ]; then - echo "rpc-file-mode=0660" | tee -a ${CLCONF} - fi -fi - -if [ "${BTCPayServer}" = "on" ] && [ "${CHAIN}" = "mainnet" ] ; then - # https://github.com/rootzoll/raspiblitz/issues/3007 +# https://github.com/rootzoll/raspiblitz/issues/3007 +# add for test networks as well if needed on mainnet +if [ "${blitzapi}" = "on" ] || \ + [ "${LNBitsFunding}" = "${netprefix}cl" ] || \ + [ "${BTCPayServer}" = "on" ]; then if [ $(grep -c "^rpc-file-mode=0660" < ${CLCONF}) -eq 0 ]; then echo "rpc-file-mode=0660" | tee -a ${CLCONF} fi From 305564f5c3fcdc983e5af7ecf7b9c29ba39eff7e Mon Sep 17 00:00:00 2001 From: openoms Date: Sat, 23 Jul 2022 15:10:35 +0100 Subject: [PATCH 2/6] api: fix symlink for CLN lightning-rpc access --- home.admin/config.scripts/blitz.web.api.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.admin/config.scripts/blitz.web.api.sh b/home.admin/config.scripts/blitz.web.api.sh index 602da109d..5efd3fa5b 100755 --- a/home.admin/config.scripts/blitz.web.api.sh +++ b/home.admin/config.scripts/blitz.web.api.sh @@ -182,7 +182,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then # symlink the CLN data dir for blitzapi sudo rm -rf /home/blitzapi/.lightning # not a symlink.. delete it silently # create symlink - sudo - u blitzapi ln -s /mnt/hdd/app-data/.lightning /home/blitzapi/ + sudo -u blitzapi ln -s /mnt/hdd/app-data/.lightning /home/blitzapi/ cd /home/blitzapi || exit 1 # git clone https://github.com/fusion44/blitz_api.git /home/blitzapi/blitz_api From 0734a2406ccf9965fd2cd7eef619ea54b9e359b5 Mon Sep 17 00:00:00 2001 From: openoms Date: Sat, 23 Jul 2022 15:34:11 +0100 Subject: [PATCH 3/6] improve Tor update logic --- home.admin/config.scripts/tor.network.sh | 34 +++++++++++++----------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/home.admin/config.scripts/tor.network.sh b/home.admin/config.scripts/tor.network.sh index 2f68fc834..76d8f6df2 100755 --- a/home.admin/config.scripts/tor.network.sh +++ b/home.admin/config.scripts/tor.network.sh @@ -197,22 +197,26 @@ EOF echo ;; - update) - /home/admin/config.scripts/tor.install.sh update - if sudo systemctl is-active lnd ;then - echo "# LND will be restarted" - sudo systemctl restart lnd - sudo systemctl restart tlnd 2>/dev/null - sudo systemctl restart slnd 2>/dev/null - sleep 10 - lncli unlock - fi - if sudo systemctl is-active lightningd; then - echo "# CLN will be restarted" - sudo systemctl restart lightningd - sudo systemctl restart tlightningd 2>/dev/null - sudo systemctl restart slightningd 2>/dev/null + if /home/admin/config.scripts/tor.install.sh update; then + echo "# Tor was updated to $(tor --version)" + if systemctl is-active lnd ;then + echo "# LND will be restarted" + sudo systemctl restart lnd + sudo systemctl restart tlnd 2>/dev/null + sudo systemctl restart slnd 2>/dev/null + sleep 10 + lncli unlock + fi + if systemctl is-active lightningd; then + echo "# CLN will be restarted" + sudo systemctl restart lightningd + sudo systemctl restart tlightningd 2>/dev/null + sudo systemctl restart slightningd 2>/dev/null + fi + else + echo "# Tor was not updated" + tor --version fi ;; From 1d771a9daa777418487913745fdbcc10fe90f74e Mon Sep 17 00:00:00 2001 From: TonySanak Date: Tue, 26 Jul 2022 15:07:54 +0200 Subject: [PATCH 4/6] Fixing typo (#3240) To show on the presentation :) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe43089ff..998b16eb5 100644 --- a/README.md +++ b/README.md @@ -767,7 +767,7 @@ If there is a public IP change on your router LND restarts automatically, and wi See [below on this README](README.md#backup-for-on-chain---channel-funds) for your Backup options when it comes to securing your funds against accidental loss. Storing the encrypted Static Channel Backup file to your Nextcloud account is an easy and secure way to do this. -Nextcloud is an open-source project to host your own files: - in its basics its an open DropBox replacement ... but can do much much more. +Nextcloud is an open-source project to host your own files: - in its basics it's an open DropBox replacement... but can do much much more. You can run it yourself or use a hosted Nextcloud server. Find free Nextcloud providers here to sign up: From a66e0b0ead637a44a15506daf33a4ca7cab6fc13 Mon Sep 17 00:00:00 2001 From: Itchy Max <88702308+itchymax@users.noreply.github.com> Date: Tue, 26 Jul 2022 23:10:50 +1000 Subject: [PATCH 5/6] Upgrade itchysats to 0.5.0 (#3241) --- home.admin/config.scripts/bonus.itchysats.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.admin/config.scripts/bonus.itchysats.sh b/home.admin/config.scripts/bonus.itchysats.sh index 65c6d2529..f088a82e9 100755 --- a/home.admin/config.scripts/bonus.itchysats.sh +++ b/home.admin/config.scripts/bonus.itchysats.sh @@ -11,7 +11,7 @@ GITHUB_REPO="https://github.com/itchysats/itchysats" # can also be a commit hash # if empty it will use the latest source version # GITHUB_VERSION=$( curl -s https://api.github.com/repos/itchysats/itchysats/releases | jq -r '.[].tag_name' | grep -v "rc" | head -n1) -GITHUB_VERSION="0.4.21" +GITHUB_VERSION="0.5.0" # the github signature to verify the author # leave GITHUB_SIGN_AUTHOR empty to skip verifying From 9cb517439649d2171eda767a371556151bd7eef3 Mon Sep 17 00:00:00 2001 From: rootzoll Date: Tue, 26 Jul 2022 15:12:11 +0200 Subject: [PATCH 6/6] #3241 update itchy sats version in CHANGES --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 36bce7ea7..5e6dbb334 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,7 +9,7 @@ - New: Core Lightning connection to BTCPayServer (CONNECT menu) [details](https://github.com/rootzoll/raspiblitz/issues/3155) - New: Alby (Connection Menu) [details](https://getalby.com/) - New: Homer Dashboard 22.06.1 [details](https://github.com/bastienwirtz/homer#readme) -- New: ItchySats 0.4.21 [details](https://github.com/itchysats/itchysats/) +- New: ItchySats 0.5.0 [details](https://github.com/itchysats/itchysats/) - New: ckbunker CLI install script (experimental) [details](https://github.com/rootzoll/raspiblitz/issues/1062) - Update: Bitcoin Core v23.0 [details](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-23.0.md) - Update: Core Lightning (CLN - formerly C-lightning) v0.11.2 [details](https://github.com/ElementsProject/lightning/releases/tag/v0.11.2)