LNbits update to v0.12.4 (#4491)

* lnbits install script formatting
* lnbits update to 0.12.4

home.admin/assets/nginx/sites-available/lnbits_ssl.conf

@@ -20,6 +20,11 @@ server {
     location / {
         proxy_pass http://127.0.0.1:5000;
         
+        # needed for websocket connections
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
         include /etc/nginx/snippets/ssl-proxy-params.conf;
     }
 

home.admin/assets/nginx/sites-available/lnbits_tor_ssl.conf

@@ -19,6 +19,11 @@ server {
     location / {
         proxy_pass https://127.0.0.1:5001;
 
+        # needed for websocket connections
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
         include /etc/nginx/snippets/ssl-proxy-params.conf;
     }
 

home.admin/config.scripts/bonus.lnbits.sh

@@ -3,7 +3,7 @@
 # https://github.com/lnbits/lnbits
 
 # https://github.com/lnbits/lnbits/releases
-tag="0.11.3"
+tag="0.12.4"
 VERSION="${tag}"
 
 # command info
@@ -225,7 +225,7 @@ Consider adding a IP2TOR Bridge under OPTIONS."
 
   WIDTH=66
   CHOICE_HEIGHT=$(("${#OPTIONS[@]}/2+1"))
-  HEIGHT=$((CHOICE_HEIGHT+7))
+  HEIGHT=$((CHOICE_HEIGHT + 7))
   CHOICE=$(dialog --clear \
     --title " LNbits - Options" \
     --ok-label "Select" \
@@ -303,15 +303,15 @@ Consider adding a IP2TOR Bridge under OPTIONS."
 
       counter=0
       cd $backup_target
-              for f in `find *.* -maxdepth 1 -type f`; do
+      for f in $(find *.* -maxdepth 1 -type f); do
         [[ -f "$f" ]] || continue
-                counter=$(($counter+1))
+        counter=$(($counter + 1))
         OPTIONS_RESTORE+=($counter "$f")
       done
 
       WIDTH_RESTORE=66
       CHOICE_HEIGHT_RESTORE=$(("${#OPTIONS_RESTORE[@]}/2+1"))
-              HEIGHT_RESTORE=$((CHOICE_HEIGHT_RESTORE+7))
+      HEIGHT_RESTORE=$((CHOICE_HEIGHT_RESTORE + 7))
       CHOICE_RESTORE=$(dialog --clear \
         --title " LNbits - Backup restore" \
         --ok-label "Select" \
@@ -324,7 +324,7 @@ Consider adding a IP2TOR Bridge under OPTIONS."
       # start restore with selected backup
       clear
       if [ "$CHOICE_RESTORE" != "" ]; then
-                backup_file=${backup_target}/${OPTIONS_RESTORE[$(($CHOICE_RESTORE*2-1))]}
+        backup_file=${backup_target}/${OPTIONS_RESTORE[$(($CHOICE_RESTORE * 2 - 1))]}
         /home/admin/config.scripts/bonus.lnbits.sh restore "${backup_file}"
         echo
         echo "Restore done"
@@ -358,6 +358,7 @@ This can fail for unknown circumstances. Revert of this process is possible afte
   *)
     clear
     exit 0
+    ;;
   esac
 
   exit 0
@@ -381,7 +382,7 @@ if [ "$1" = "status" ]; then
 
     # auth method is to call with a certain useer id
     #admin_userid=$(sudo cat /home/lnbits/lnbits/.super_user)
-    admin_userid=$(sudo cat /mnt/hdd/app-data/LNBits/data/.super_user);
+    admin_userid=$(sudo cat /mnt/hdd/app-data/LNBits/data/.super_user)
     echo "authMethod='/wallet?usr=${admin_userid}'"
 
     # check funding source
@@ -587,21 +588,22 @@ if [ "$1" = "sync" ] || [ "$1" = "repo" ]; then
   # pull latest code
   sudo -u lnbits git pull
 
-  # check if poetry in installed, if not install it
+  echo "# check if poetry in installed, if not install it"
   if ! sudo -u lnbits which poetry; then
     echo "# install poetry"
     sudo pip3 install --upgrade pip
     sudo pip3 install poetry
   fi
-  # do install like this
+
+  echo "# install"
   sudo -u lnbits poetry install
 
-  # make sure default virtaulenv is used
+  echo "# make sure the default virtualenv is used"
   sudo apt-get remove -y python3-virtualenv 2>/dev/null
   sudo pip uninstall -y virtualenv 2>/dev/null
   sudo apt-get install -y python3-virtualenv
 
-  # restart lnbits service
+  echo "# restart lnbits service"
   sudo systemctl restart lnbits
   echo "# server is restarting ... maybe takes some seconds until available"
   exit 0
@@ -619,12 +621,6 @@ if [ "$1" = "install" ]; then
     exit 0
   fi
 
-  echo "# *** INSTALL LNBITS ${VERSION} ***"
-
-  # add lnbits user
-  echo "*** Add the 'lnbits' user ***"
-  sudo adduser --system --group --home /home/lnbits lnbits
-
   # get optional github parameter
   githubUser="lnbits"
   if [ "$2" != "" ]; then
@@ -634,6 +630,13 @@ if [ "$1" = "install" ]; then
     tag="$3"
   fi
 
+  echo "# *** INSTALL LNBITS ***"
+  echo "# githubUser=$githubUser tag=$tag"
+
+  # add lnbits user
+  echo "*** Add the 'lnbits' user ***"
+  sudo adduser --system --group --home /home/lnbits lnbits
+
   # install from GitHub
   echo "# get the github code user(${githubUser}) branch(${tag})"
   sudo rm -r /home/lnbits/lnbits 2>/dev/null
@@ -652,7 +655,8 @@ if [ "$1" = "install" ]; then
     sudo pip3 install --upgrade pip
     sudo pip3 install poetry
   fi
-  # do install like this
+
+  echo "# install"
   sudo -u lnbits poetry install
 
   # make sure default virtaulenv is used
@@ -681,7 +685,6 @@ if [ "$1" = "uninstall" ]; then
   exit 0
 fi
 
-
 # on
 if [ "$1" = "1" ] || [ "$1" = "on" ]; then
 
@@ -1069,7 +1072,7 @@ if [ "$1" = "backup" ]; then
   else
     # sqlite backup
     backup_target="/mnt/hdd/app-data/backup/lnbits_sqlite"
-    backup_file="lnbits_sqlite_`date +%d`-`date +%m`-`date +%Y`_`date +%H`-`date +%M`_fs.tar"
+    backup_file="lnbits_sqlite_$(date +%d)-$(date +%m)-$(date +%Y)_$(date +%H)-$(date +%M)_fs.tar"
     if [ ! -d $backup_target ]; then
       sudo mkdir -p $backup_target 1>&2
     fi
@@ -1191,9 +1194,8 @@ if [ "$1" = "migrate" ]; then
     # execStartPre is not enough, wait for lnbits is finally running
     count=0
     count_max=30
-    while ! nc -zv 127.0.0.1 5000 2>/dev/null;
-    do
-      count=`expr $count + 1`
+    while ! nc -zv 127.0.0.1 5000 2>/dev/null; do
+      count=$(expr $count + 1)
       echo "wait for LNBIts to start (${count}s/${count_max}s)"
       sleep 1
       if [ $count = $count_max ]; then