diff --git a/home.admin/config.scripts/bonus.lnbits.sh b/home.admin/config.scripts/bonus.lnbits.sh index 0d483b072..5d5477bab 100755 --- a/home.admin/config.scripts/bonus.lnbits.sh +++ b/home.admin/config.scripts/bonus.lnbits.sh @@ -437,8 +437,11 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then # add lnbits user echo "*** Add the 'lnbits' user ***" - sudo adduser --disabled-password --gecos "" lnbits 2>/dev/null + sudo adduser --disabled-password --gecos "" lnbits + echo "# add the 'lnbits' user to the 'bitcoin' group" sudo /usr/sbin/usermod --append --groups bitcoin lnbits + echo "# check user" + id lnbits # get optional github parameter githubUser="lnbits" @@ -653,6 +656,8 @@ if [ "$1" = "switch" ]; then echo "# allowing lnbits user as part of the bitcoin group to RW RPC hook" sudo chmod 770 /home/bitcoin/.lightning/bitcoin${clrpcsubdir} sudo chmod 660 /home/bitcoin/.lightning/bitcoin${clrpcsubdir}/lightning-rpc + echo "# check the lightning-rpc socket" + sudo ls -la /home/bitcoin/.lightning/bitcoin${clrpcsubdir}/lightning-rpc echo "# preparing lnbits config for c-lightning" sudo bash -c "echo 'LNBITS_BACKEND_WALLET_CLASS=CLightningWallet' >> /home/lnbits/lnbits/.env" diff --git a/home.admin/config.scripts/cl-plugin.summary.sh b/home.admin/config.scripts/cl-plugin.summary.sh index cde53ddd0..03fca26c4 100644 --- a/home.admin/config.scripts/cl-plugin.summary.sh +++ b/home.admin/config.scripts/cl-plugin.summary.sh @@ -20,9 +20,9 @@ fi if [ $($lightningcli_alias | grep -c "summary") -eq 0 ];then echo "# Starting the summary plugin" # https://github.com/ElementsProject/lightning/tree/master/contrib/pylightning - sudo -u bitcoin pip install pylightning 1>/dev/null + sudo -u bitcoin pip install --user pylightning 1>/dev/null # https://github.com/lightningd/plugins#dynamic-plugin-initialization - sudo -u bitcoin pip install -r /home/bitcoin/cl-plugins-available/plugins/summary/requirements.txt 1>/dev/null + sudo -u bitcoin pip install --user -r /home/bitcoin/cl-plugins-available/plugins/summary/requirements.txt 1>/dev/null $lightningcli_alias plugin start -H /home/bitcoin/cl-plugins-available/plugins/summary/summary.py 1>/dev/null fi @@ -41,5 +41,29 @@ $lightningcli_alias -H summary echo if [ "$(echo "$@" | grep -c "runonce")" -gt 0 ];then + $lightningcli_alias plugin stop /home/bitcoin/cl-plugins-available/plugins/summary/summary.py +fi + + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/.local/lib/python3.9/site-packages" ] ; then + PATH="$HOME/.local/lib/python3.9/site-packages:$PATH" +fi +/home/bitcoin/.local/lib/python3.9/site-packages + +# https://docs.python.org/3/library/site.html +echo "/home/bitcoin/.local/lib/python3.9/site-packages/" | sudo tee /usr/local/lib/python3.9/bitcoin.pth + +/usr/local/lib/python3.9/site-packages +/usr/local/lib/python3.9 + +# stop plugin +if [ $($lightningcli_alias | grep -c "summary") -gt 0 ];then $lightningcli_alias plugin stop -H /home/bitcoin/cl-plugins-available/plugins/summary/summary.py -fi \ No newline at end of file +fi +# uninstall user packages only +sudo -u bitcoin pip uninstall -r /home/bitcoin/cl-plugins-available/plugins/summary/requirements.txt +sudo rm -rf /home/bitcoin/cl-plugins-available/plugins +or to update +cd /home/bitcoin/cl-plugins-available/plugins +sudo -u bitcoin git pull \ No newline at end of file