diff --git a/CHANGES.md b/CHANGES.md index 01de6b80..0b2dfb86 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,11 +10,11 @@ - New: Squeaknode [details](https://github.com/squeaknode/squeaknode#readme) - New: Homer Dashboard [details](https://github.com/bastienwirtz/homer#readme) - 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.0.1 [details](https://github.com/ElementsProject/lightning/releases/tag/v0.11.0.1) +- Update: Core Lightning (CLN - formerly C-lightning) v0.11.1 [details](https://github.com/ElementsProject/lightning/releases/tag/v0.11.1) - Update: LND v0.14.3 [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.14.3-beta) - Update: RTL v0.12.3 [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.12.3) - Update: LNbits 0.8.0 [details](https://github.com/lnbits/lnbits-legend/releases/tag/0.8.0) -- Update: C-lightningREST v0.7.0 [details](https://github.com/Ride-The-Lightning/c-lightning-REST/releases/tag/v0.7.0) +- Update: C-lightningREST v0.7.2 [details](https://github.com/Ride-The-Lightning/c-lightning-REST/releases/tag/v0.7.2) - Update: CLBOSS 0.13A [details](https://github.com/ZmnSCPxj/clboss/releases/tag/0.13A) - Update: Channel Tools (chantools) v0.10.4 [details](https://github.com/guggero/chantools/blob/master/README.md) - Update: Electrum Server in Rust (electrs) v0.9.7 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#097-apr-30-2022) diff --git a/home.admin/config.scripts/cl.rest.sh b/home.admin/config.scripts/cl.rest.sh index c2ecae73..7e2bc423 100644 --- a/home.admin/config.scripts/cl.rest.sh +++ b/home.admin/config.scripts/cl.rest.sh @@ -1,7 +1,7 @@ #!/bin/bash # https://github.com/Ride-The-Lightning/c-lightning-REST/releases/ -CLRESTVERSION="v0.7.0" +CLRESTVERSION="v0.7.2" # help if [ $# -eq 0 ]||[ "$1" = "-h" ]||[ "$1" = "--help" ];then @@ -9,7 +9,6 @@ if [ $# -eq 0 ]||[ "$1" = "-h" ]||[ "$1" = "--help" ];then echo "C-lightning-REST install script" echo "The default version is: $CLRESTVERSION" echo "mainnet | testnet | signet instances can run parallel" - echo "The same macaroon and certs will be used for the parallel networks" echo echo "Usage:" echo "cl.rest.sh [on|off|connect] [?key-value]" @@ -42,7 +41,7 @@ if [ "$1" = connect ];then /home/admin/config.scripts/tor.onion-service.sh ${netprefix}clrest 443 ${portprefix}6100 1>/dev/null toraddress=$(sudo cat /mnt/hdd/tor/${netprefix}clrest/hostname) - hex_macaroon=$(xxd -plain /home/bitcoin/c-lightning-REST/certs/access.macaroon | tr -d '\n') + hex_macaroon=$(xxd -plain /home/bitcoin/c-lightning-REST/${CLNETWORK}/certs//access.macaroon | tr -d '\n') url="https://${localip}:${portprefix}6100/" lndconnect="lndconnect://${toraddress}:443?macaroon=${hex_macaroon}" @@ -126,6 +125,11 @@ if [ "$1" = on ]; then \"RPCCOMMANDS\": [\"*\"] }" | sudo -u bitcoin tee ./${CLNETWORK}/cl-rest-config.json + # copy clrest to a CLNETWORK subdor to make parallel networks possible + sudo -u bitcoin mkdir /home/bitcoin/c-lightning-REST/${CLNETWORK} + sudo -u bitcoin cp -r /home/bitcoin/c-lightning-REST/* \ + /home/bitcoin/c-lightning-REST/${CLNETWORK} + echo " # systemd unit for c-lightning-REST for ${CHAIN} # /etc/systemd/system/${netprefix}clrest.service @@ -135,8 +139,7 @@ Wants=${netprefix}lightningd.service After=${netprefix}lightningd.service [Service] -WorkingDirectory=/home/bitcoin/c-lightning-REST/${CLNETWORK} -ExecStart=/usr/bin/node /home/bitcoin/c-lightning-REST/cl-rest.js +ExecStart=/usr/bin/node /home/bitcoin/c-lightning-REST/${CLNETWORK}/cl-rest.js User=bitcoin Restart=always TimeoutSec=120