add the Lightning Terminal 0.4.1-alpha (#1994)

home.admin/_commands.sh

@@ -225,6 +225,21 @@ function pool() {
   fi
 }
 
+# aliases for lit
+# switch to the pool user for the Pool Service
+if [ $(grep -c "lit=on"  < /mnt/hdd/raspiblitz.conf) -gt 0 ]; then
+  source /mnt/hdd/raspiblitz.conf
+  alias lit-frcli="sudo -u lit frcli --rpcserver=localhost:8443 \
+    --tlscertpath=/home/lit/.lit/tls.cert \
+    --macaroonpath=/home/lit/.faraday/${chain}net/faraday.macaroon"
+  alias lit-loop="sudo -u lit loop --rpcserver=localhost:8443 \\
+    --tlscertpath=/home/lit/.lit/tls.cert \\	
+    --macaroonpath=/home/lit/.loop/${chain}net/loop.macaroon"
+  alias lit-pool="sudo -u lit pool --rpcserver=localhost:8443 \
+    --tlscertpath=/home/lit/.lit/tls.cert \	
+    --macaroonpath=/home/lit/.pool/${chain}net/pool.macaroon"
+fi
+
 # command: gettx
 # retrieve transaction from mempool or blockchain and print as JSON
 # $ gettx "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16"

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

@@ -0,0 +1,360 @@
+#!/bin/bash
+
+# https://github.com/lightninglabs/lightning-terminal/releases
+LITVERSION="0.4.1-alpha"
+
+# command info
+if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
+ echo "config script to switch the Lightning Terminal Service on or off"
+ echo "installs the version $LITVERSION"
+ echo "bonus.lit.sh [on|off|menu]"
+ exit 1
+fi
+
+# check who signed the release in https://github.com/lightninglabs/lightning-terminal/releases
+PGPsigner="guggero" 
+if [ $PGPsigner=guggero ];then
+  PGPpkeys="https://keybase.io/guggero/pgp_keys.asc"
+  PGPcheck="03DB6322267C373B"
+fi
+
+source /mnt/hdd/raspiblitz.conf
+
+# add default value to raspi config if needed
+if ! grep -Eq "^lit=" /mnt/hdd/raspiblitz.conf; then
+  echo "lit=off" >> /mnt/hdd/raspiblitz.conf
+fi
+
+# show info menu
+if [ "$1" = "menu" ]; then
+
+  # get network info
+  localip=$(ip addr | grep 'state UP' -A2 | egrep -v 'docker0' | grep 'eth0\|wlan0' | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
+  toraddress=$(sudo cat /mnt/hdd/tor/lit/hostname 2>/dev/null)
+  fingerprint=$(openssl x509 -in /home/lit/.lit/tls.cert -fingerprint -noout | cut -d"=" -f2)
+
+  if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then
+    # Info with TOR
+    /home/admin/config.scripts/blitz.lcd.sh qr "${toraddress}"
+    whiptail --title " Lightning Terminal " --msgbox "Open in your local web browser & accept self-signed cert:
+https://${localip}:8443\n
+SHA1 Thumb/Fingerprint:
+${fingerprint}\n
+Use your Password B to login.\n
+Hidden Service address for the Tor Browser (see LCD for QR):
+https://${toraddress}\n
+For the command line switch to 'lit' user with: 'sudo su - lit'
+use the commands: 'lncli', 'lit-loop', 'lit-pool' and 'lit-frcli'.
+" 19 74
+    /home/admin/config.scripts/blitz.lcd.sh hide
+  else
+    # Info without TOR
+    whiptail --title " Lightning Terminal " --msgbox "Open in your local web browser & accept self-signed cert:
+https://${localip}:8443\n
+SHA1 Thumb/Fingerprint:
+${fingerprint}\n
+Use your Password B to login.\n
+Activate TOR to access the web interface from outside your local network.\n
+For the command line switch to 'lit' user with: 'sudo su - lit'
+use the commands: 'lncli', 'lit-loop', 'lit-pool' and 'lit-frcli'.
+" 19 63
+  fi
+  echo "please wait ..."
+  exit 0
+fi
+
+# stop services
+echo "making sure the lit service is not running"
+sudo systemctl stop litd 2>/dev/null
+
+# switch on
+if [ "$1" = "1" ] || [ "$1" = "on" ]; then
+  echo "# INSTALL LIGHTNING TERMINAL"
+  
+  isInstalled=$(sudo ls /etc/systemd/system/litd.service 2>/dev/null | grep -c 'litd.service')
+  if [ ${isInstalled} -eq 0 ]; then
+ 
+    # create dedicated user
+    sudo adduser --disabled-password --gecos "" lit || exit 1
+
+    # make sure symlink to central app-data directory exists
+    sudo rm -rf /home/lit/.lnd  # not a symlink.. delete it silently
+    # create symlink
+    sudo ln -s "/mnt/hdd/app-data/lnd/" "/home/lit/.lnd"
+
+    # sync all macaroons and unix groups for access
+    /home/admin/config.scripts/lnd.credentials.sh sync
+    # macaroons will be checked after install
+
+    # add user to group with admin access to lnd
+    sudo /usr/sbin/usermod --append --groups lndadmin lit
+    # add user to group with readonly access on lnd
+    sudo /usr/sbin/usermod --append --groups lndreadonly lit
+    # add user to group with invoice access on lnd
+    sudo /usr/sbin/usermod --append --groups lndinvoice lit
+    # add user to groups with all macaroons
+    sudo /usr/sbin/usermod --append --groups lndinvoices lit
+    sudo /usr/sbin/usermod --append --groups lndchainnotifier lit
+    sudo /usr/sbin/usermod --append --groups lndsigner lit
+    sudo /usr/sbin/usermod --append --groups lndwalletkit lit
+    sudo /usr/sbin/usermod --append --groups lndrouter lit
+
+    echo "# persist settings in app-data"
+    # move old data if present
+    sudo mv /home/lit/.lit /mnt/hdd/app-data/ 2>/dev/null
+    echo "# make sure the data directory exists"
+    sudo mkdir -p /mnt/hdd/app-data/.lit
+    echo "# symlink"
+    sudo rm -rf /home/lit/.lit # not a symlink.. delete it silently
+    sudo ln -s /mnt/hdd/app-data/.lit/ /home/lit/.lit
+    sudo chown lit:lit -R /mnt/hdd/app-data/.lit
+
+    echo "# move the standalone Loop and Pool data to LiT"
+    echo "# Loop"
+    # move old data if present
+    sudo mv /home/loop/.loop /mnt/hdd/app-data/ 2>/dev/null
+    echo "# remove so can't be used parallel with LiT"
+    config.scripts/bonus.loop.sh off
+    echo "# make sure the data directory exists"
+    sudo mkdir -p /mnt/hdd/app-data/.loop
+    echo "# symlink"
+    sudo rm -rf /home/lit/.loop # not a symlink.. delete it silently
+    sudo ln -s /mnt/hdd/app-data/.loop/ /home/lit/.loop
+    sudo chown lit:lit -R /mnt/hdd/app-data/.loop
+    
+    echo "# Pool"
+    echo "# remove so can't be used parallel with LiT"
+    config.scripts/bonus.pool.sh off
+    echo "# make sure the data directory exists"
+    sudo mkdir -p /mnt/hdd/app-data/.pool
+    echo "# symlink"
+    sudo rm -rf /home/lit/.pool # not a symlink.. delete it silently
+    sudo ln -s /mnt/hdd/app-data/.pool/ /home/lit/.pool
+    sudo chown lit:lit -R /mnt/hdd/app-data/.pool
+
+    echo "Detect CPU architecture ..." 
+    isARM=$(uname -m | grep -c 'arm')
+    isAARCH64=$(uname -m | grep -c 'aarch64')
+    isX86_64=$(uname -m | grep -c 'x86_64')
+    if [ ${isARM} -eq 0 ] && [ ${isAARCH64} -eq 0 ] && [ ${isX86_64} -eq 0 ]; then
+      echo "!!! FAIL !!!"
+      echo "Can only build on ARM, aarch64, x86_64 or i386 not on:"
+      uname -m
+      exit 1
+    else
+    echo "OK running on $(uname -m) architecture."
+    fi
+
+    downloadDir="/home/admin/download/lit"  # edit your download directory
+    rm -rf "${downloadDir}"
+    mkdir -p "${downloadDir}"
+    cd "${downloadDir}" || exit 1
+
+    # extract the SHA256 hash from the manifest file for the corresponding platform
+    wget -N https://github.com/lightninglabs/lightning-terminal/releases/download/v${LITVERSION}/manifest-v${LITVERSION}.txt
+    if [ ${isARM} -eq 1 ] ; then
+      OSversion="armv7"
+    elif [ ${isAARCH64} -eq 1 ] ; then
+      OSversion="arm64"
+    elif [ ${isX86_64} -eq 1 ] ; then
+      OSversion="amd64"
+    fi 
+    SHA256=$(grep -i "linux-$OSversion" manifest-v$LITVERSION.txt | cut -d " " -f1)
+
+    echo
+    echo "# LiT v${LITVERSION} for ${OSversion}"
+    echo "# SHA256 hash: $SHA256"
+    echo
+    echo "# get LiT binary"
+    binaryName="lightning-terminal-linux-${OSversion}-v${LITVERSION}.tar.gz"
+    wget -N https://github.com/lightninglabs/lightning-terminal/releases/download/v${LITVERSION}/${binaryName}
+
+    echo "# check binary was not manipulated (checksum test)"
+    wget -N https://github.com/lightninglabs/lightning-terminal/releases/download/v${LITVERSION}/manifest-${PGPsigner}-v${LITVERSION}.sig
+    wget --no-check-certificate ${PGPpkeys}
+    binaryChecksum=$(sha256sum ${binaryName} | cut -d " " -f1)
+    if [ "${binaryChecksum}" != "${SHA256}" ]; then
+      echo "!!! FAIL !!! Downloaded LiT BINARY not matching SHA256 checksum: ${SHA256}"
+      exit 1
+    fi
+
+    echo "# check gpg finger print"
+    gpg --keyid-format LONG ./pgp_keys.asc
+    fingerprint=$(gpg --keyid-format LONG "./pgp_keys.asc" 2>/dev/null \
+    | grep "${PGPcheck}" -c)
+    if [ ${fingerprint} -lt 1 ]; then
+      echo ""
+      echo "!!! BUILD WARNING --> LiT PGP author not as expected"
+      echo "Should contain PGP: ${PGPcheck}"
+      echo "PRESS ENTER to TAKE THE RISK if you think all is OK"
+      read key
+    fi
+    gpg --import ./pgp_keys.asc
+    sleep 3
+    verifyResult=$(gpg --verify manifest-${PGPsigner}-v${LITVERSION}.sig manifest-v${LITVERSION}.txt 2>&1)
+    goodSignature=$(echo ${verifyResult} | grep 'Good signature' -c)
+    echo "goodSignature(${goodSignature})"
+    correctKey=$(echo ${verifyResult} | tr -d " \t\n\r" | grep "${GPGcheck}" -c)
+    echo "correctKey(${correctKey})"
+    if [ ${correctKey} -lt 1 ] || [ ${goodSignature} -lt 1 ]; then
+      echo ""
+      echo "!!! BUILD FAILED --> LND PGP Verify not OK / signature(${goodSignature}) verify(${correctKey})"
+      exit 1
+    fi
+    ###########
+    # install #
+    ###########
+    tar -xzf ${binaryName}
+    sudo install -m 0755 -o root -g root -t /usr/local/bin lightning-terminal-linux-${OSversion}-v${LITVERSION}/*
+
+    ###########
+    # config  #
+    ###########
+    if [ "${runBehindTor}" = "on" ]; then
+      echo "# Connect to the Pool server through Tor"
+      LOOPPROXY="loop.server.proxy=127.0.0.1:9050"
+      POOLPROXY="pool.proxy=127.0.0.1:9050"
+    else
+      echo "# Connect to Pool and Loop server through clearnet"
+      LOOPPROXY=""
+      POOLPROXY=""
+    fi
+    PASSWORD_B=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcpassword | cut -c 13-)
+    echo "
+# Application Options
+httpslisten=0.0.0.0:8443
+uipassword=$PASSWORD_B
+#letsencrypt=true
+#letsencrypthost=loop.merchant.com
+lit-dir=/home/lit/.lit
+
+# Remote options
+remote.lit-debuglevel=debug
+
+# Remote lnd options
+remote.lnd.rpcserver=127.0.0.1:10009
+remote.lnd.macaroonpath=/home/lit/.lnd/data/chain/${network}/${chain}net/admin.macaroon
+remote.lnd.tlscertpath=/home/lit/.lnd/tls.cert
+
+# Loop
+loop.loopoutmaxparts=5
+$LOOPPROXY
+
+# Pool
+pool.newnodesonly=true
+$POOLPROXY
+
+# Faraday
+faraday.min_monitored=48h
+
+# Faraday - bitcoin
+faraday.connect_bitcoin=true
+faraday.bitcoin.host=localhost
+faraday.bitcoin.user=raspibolt
+faraday.bitcoin.password=$PASSWORD_B
+" | sudo tee /mnt/hdd/app-data/.lit/lit.conf
+
+    # secure
+    sudo chown lit:lit /mnt/hdd/app-data/.lit/lit.conf
+    sudo chmod 600 /mnt/hdd/app-data/.lit/lit.conf | exit 1
+
+    ############
+    # service  #
+    ############
+    # sudo nano /etc/systemd/system/litd.service
+    echo "
+[Unit]
+Description=litd Service
+After=lnd.service
+
+[Service]
+ExecStart=/usr/local/bin/litd
+User=lit
+Group=lit
+Type=simple
+KillMode=process
+TimeoutSec=60
+Restart=always
+RestartSec=60
+
+[Install]
+WantedBy=multi-user.target
+" | sudo tee -a /etc/systemd/system/litd.service
+    sudo systemctl enable litd
+    echo "OK - the Lightning lit service is now enabled"
+
+  else 
+    echo "# The Lightning Terminal is already installed."
+  fi
+
+  # aliases
+  echo "
+alias lit-loop=\"loop --rpcserver=localhost:8443 \\
+  --tlscertpath=/home/lit/.lit/tls.cert \\	
+  --macaroonpath=/home/lit/.loop/${chain}net/loop.macaroon\"
+alias lit-pool=\"pool --rpcserver=localhost:8443 \\
+  --tlscertpath=/home/lit/.lit/tls.cert \\	
+  --macaroonpath=/home/lit/.pool/${chain}net/pool.macaroon\"
+alias lit-frcli=\"frcli --rpcserver=localhost:8443 \\
+  --tlscertpath=/home/lit/.lit/tls.cert \\
+  --macaroonpath=/home/lit/.faraday/${chain}net/faraday.macaroon\"
+" | sudo tee -a /home/lit/.bashrc
+
+  # open ports on firewall
+  sudo ufw allow 8443 comment "Lightning Terminal"
+
+  # setting value in raspi blitz config
+  sudo sed -i "s/^lit=.*/lit=on/g" /mnt/hdd/raspiblitz.conf
+  
+  # Hidden Service if Tor is active
+  if [ "${runBehindTor}" = "on" ]; then
+    # make sure to keep in sync with internet.tor.sh script
+    /home/admin/config.scripts/internet.hiddenservice.sh lit 443 8443
+  fi
+
+  source /home/admin/raspiblitz.info
+  if [ "${state}" == "ready" ]; then
+    echo "# OK - the litd.service is enabled, system is ready so starting service"
+    sudo systemctl start litd
+  else
+    echo "# OK - the litd.service is enabled, to start manually use: 'sudo systemctl start litd'"
+  fi
+
+  exit 0
+fi
+
+# switch off
+if [ "$1" = "0" ] || [ "$1" = "off" ]; then
+
+  # setting value in raspi blitz config
+  sudo sed -i "s/^lit=.*/lit=off/g" /mnt/hdd/raspiblitz.conf
+
+  isInstalled=$(sudo ls /etc/systemd/system/litd.service 2>/dev/null | grep -c 'litd.service')
+  if [ ${isInstalled} -eq 1 ]; then
+    echo "*** REMOVING LIT ***"
+    # remove the systemd service
+    sudo systemctl stop litd
+    sudo systemctl disable litd
+    sudo rm /etc/systemd/system/litd.service
+    # delete user 
+    sudo userdel -rf lit
+    # close ports on firewall
+    sudo ufw deny 8443
+    # delete Go package
+    sudo rm /usr/local/bin/litd
+    echo "# OK, the lit.service is removed."
+    # Hidden Service if Tor is active
+    if [ "${runBehindTor}" = "on" ]; then
+      /home/admin/config.scripts/internet.hiddenservice.sh off lit
+    fi
+  else 
+    echo "# LiT is not installed."
+  fi
+
+  exit 0
+fi
+
+echo "FAIL - Unknown Parameter $1"
+echo "may need reboot to run normal again"
+exit 1
+  

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

@@ -63,7 +63,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     sudo mkdir -p /mnt/hdd/app-data/.loop
     echo "# symlink"
     sudo rm -rf /home/loop/.loop # not a symlink.. delete it silently
-    sudo ln -s /mnt/hdd/app-data/.loop/ 
+    sudo ln -s /mnt/hdd/app-data/.loop/ /home/loop/.loop
     sudo chown loop:loop -R /mnt/hdd/app-data/.loop
 
     # install from source

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

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pinnedVersion="v0.10.0"
+RTLVERSION="v0.10.1"
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
  echo "# config script to switch the RideTheLightning WebGUI on, off or update"
  echo "# bonus.rtl.sh [on|off|update<commit>|menu]"
- echo "# installs the version $pinnedVersion by default"
+ echo "# installs the version $RTLVERSION by default"
  exit 1
 fi
 
@@ -58,102 +58,115 @@ if ! grep -Eq "^rtlWebinterface=" /mnt/hdd/raspiblitz.conf; then
 fi
 
 # stop services
-echo "making sure services are not running"
+echo "# making sure services are not running"
 sudo systemctl stop RTL 2>/dev/null
 
-# switch on
+function configRTL() {
-if [ "$1" = "1" ] || [ "$1" = "on" ]; then
+  SWAPSERVERPORT=8081
-  echo "*** INSTALL RTL ***"
+  if [ "$(grep -Ec "(loop=|lit=)" < /mnt/hdd/raspiblitz.conf)" -gt 0 ];then 
-
+    if [ $lit = on ];then
-  isInstalled=$(sudo ls /etc/systemd/system/RTL.service 2>/dev/null | grep -c 'RTL.service')
+      echo "# Add the rtl user to the lit group"
-  if ! [ ${isInstalled} -eq 0 ]; then
+      sudo /usr/sbin/usermod --append --groups lit rtl
-    echo "RTL already installed."
+      echo "# Symlink the lit-loop.macaroon"
-
+      sudo rm -rf "/home/rtl/.loop"                    #  delete symlink
+      sudo ln -s "/home/lit/.loop/" "/home/rtl/.loop"  # create symlink
+      SWAPSERVERPORT=8443
+    elif [ $loop = on ];then
+      echo "# Add the rtl user to the loop group"
+      sudo /usr/sbin/usermod --append --groups loop rtl
+      echo "# Symlink the loop.macaroon"
+      sudo rm -rf "/home/rtl/.loop"                     # delete symlink
+      sudo ln -s "/home/loop/.loop/" "/home/rtl/.loop"  # create symlink
+    fi
+    echo "# Make the loop macaroon group readable"
+    sudo chmod 640 /home/rtl/.loop/mainnet/macaroons.db
   else
-    # check and install NodeJS
+    echo "# No Loop or LiT is installed"
-    /home/admin/config.scripts/bonus.nodejs.sh on
+  fi
 
-    # create rtl user
+  # prepare RTL-Config.json file
-    sudo adduser --disabled-password --gecos "" rtl
+  echo "# RTL.conf"
-
+  # change of config: https://github.com/Ride-The-Lightning/RTL/tree/v0.6.4
-    echo "*** make sure rtl is member of lndadmin ***"
+  sudo cp /home/rtl/RTL/sample-RTL-Config.json /home/admin/RTL-Config.json
-    sudo /usr/sbin/usermod --append --groups lndadmin rtl
+  sudo chown admin:admin /home/admin/RTL-Config.json
-
+  sudo chmod 600 /home/admin/RTL-Config.json || exit 1
-    echo "*** make sure symlink to central app-data directory exists ***"
+  PASSWORD_B=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcpassword | cut -c 13-)
-    if ! [[ -L "/home/rtl/.lnd" ]]; then
+  # modify sample-RTL-Config.json and save in RTL-Config.json
-      sudo rm -rf "/home/rtl/.lnd"                          # not a symlink.. delete it silently
+  sudo node > /home/admin/RTL-Config.json <<EOF
-      sudo ln -s "/mnt/hdd/app-data/lnd/" "/home/rtl/.lnd"  # and create symlink
-    fi
-
-    echo "# add the rtl user to the loop group"
-    sudo /usr/sbin/usermod --append --groups loop rtl
-    echo "# symlink the loop.macaroon"
-    if ! [[ -L "/home/rtl/.loop" ]]; then
-      sudo rm -rf "/home/rtl/.loop"                     # not a symlink.. delete it silently
-      sudo ln -s "/home/loop/.loop/" "/home/rtl/.loop"  # and create symlink
-    fi
-
-    # download source code and set to tag release
-    echo "*** Get the RTL Source Code ***"
-    rm -rf /home/admin/RTL 2>/dev/null
-    sudo -u rtl rm -rf /home/rtl/RTL 2>/dev/null
-    sudo -u rtl git clone https://github.com/ShahanaFarooqui/RTL.git /home/rtl/RTL
-    cd /home/rtl/RTL
-    # check https://github.com/Ride-The-Lightning/RTL/releases/
-    sudo -u rtl git reset --hard $pinnedVersion
-    # from https://github.com/Ride-The-Lightning/RTL/commits/master
-    # git checkout 917feebfa4fb583360c140e817c266649307ef72
-    if [ -d "/home/rtl/RTL" ]; then
-      echo "OK - RTL code copy looks good"
-    else
-      echo "FAIL - code copy did not run correctly"
-      echo "ABORT - RTL install"
-      exit 1
-    fi
-    echo ""
-
-    # install
-    echo "*** Run: npm install ***"
-    export NG_CLI_ANALYTICS=false
-    sudo -u rtl npm install --only=prod
-    if ! [ $? -eq 0 ]; then
-        echo "FAIL - npm install did not run correctly, aborting"
-        exit 1
-    else
-        echo "OK - RTL install looks good"
-        echo ""
-    fi
-
-    cd ..
-
-    # prepare RTL-Config.json file
-    echo "*** RTL.conf ***"
-    # change of config: https://github.com/Ride-The-Lightning/RTL/tree/v0.6.4
-    sudo cp /home/rtl/RTL/sample-RTL-Config.json /home/admin/RTL-Config.json
-    sudo chown admin:admin /home/admin/RTL-Config.json
-    sudo chmod 600 /home/admin/RTL-Config.json || exit 1
-    PASSWORD_B=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcpassword | cut -c 13-)
-    # modify sample-RTL-Config.json and save in RTL-Config.json
-    sudo node > /home/admin/RTL-Config.json <<EOF
 //Read data
 var data = require('/home/rtl/RTL/sample-RTL-Config.json');
 //Manipulate data
 data.nodes[0].lnNode = '$hostname'
 data.nodes[0].Authentication.macaroonPath = '/home/rtl/.lnd/data/chain/${network}/${chain}net/'
-data.nodes[0].Authentication.swapMacaroonPath = '/home/rtl/.loop/${chain}net/'
 data.nodes[0].Authentication.configPath = '/home/rtl/.lnd/lnd.conf';
+data.nodes[0].Authentication.swapMacaroonPath = '/home/rtl/.loop/${chain}net/'
+data.nodes[0].Authentication.boltzMacaroonPath = '/home/rtl/.boltz-lnd/macaroons/'
 data.multiPass = '$PASSWORD_B';
 data.nodes[0].Settings.userPersona = 'OPERATOR'
 data.nodes[0].Settings.channelBackupPath = '/home/rtl/RTL-SCB-backup-$hostname'
-data.nodes[0].Settings.swapServerUrl = 'https://localhost:8081'
+data.nodes[0].Settings.swapServerUrl = 'https://localhost:$SWAPSERVERPORT'
 //Output data
 console.log(JSON.stringify(data, null, 2));
 EOF
-    sudo rm -f /home/rtl/RTL/RTL-Config.json
+  sudo rm -f /home/rtl/RTL/RTL-Config.json
-    sudo mv /home/admin/RTL-Config.json /home/rtl/RTL/
+  sudo mv /home/admin/RTL-Config.json /home/rtl/RTL/
-    sudo chown rtl:rtl /home/rtl/RTL/RTL-Config.json
+  sudo chown rtl:rtl /home/rtl/RTL/RTL-Config.json
+}
+
+# switch on
+if [ "$1" = "1" ] || [ "$1" = "on" ]; then
+  echo "# INSTALL RTL"
+
+  isInstalled=$(sudo ls /etc/systemd/system/RTL.service 2>/dev/null | grep -c 'RTL.service')
+  if ! [ ${isInstalled} -eq 0 ]; then
+    echo "# RTL already installed."
+  else
+    # check and install NodeJS
+    /home/admin/config.scripts/bonus.nodejs.sh on
+
+    # create rtl user
+    sudo adduser --disabled-password --gecos "" rtl || exit 1
+
+    echo "# Make sure rtl is member of lndadmin"
+    sudo /usr/sbin/usermod --append --groups lndadmin rtl
+
+    echo "# Make sure symlink to central app-data directory exists"
+    if ! [[ -L "/home/rtl/.lnd" ]]; then
+      sudo rm -rf "/home/rtl/.lnd"                          # not a symlink.. delete it silently
+      sudo ln -s "/mnt/hdd/app-data/lnd/" "/home/rtl/.lnd"  # and create symlink
+    fi
+
+    # download source code and set to tag release
+    echo "# Get the RTL Source Code"
+    rm -rf /home/admin/RTL 2>/dev/null
+    sudo -u rtl rm -rf /home/rtl/RTL 2>/dev/null
+    sudo -u rtl git clone https://github.com/ShahanaFarooqui/RTL.git /home/rtl/RTL
+    cd /home/rtl/RTL
+    # check https://github.com/Ride-The-Lightning/RTL/releases/
+    sudo -u rtl git reset --hard $RTLVERSION
+    # from https://github.com/Ride-The-Lightning/RTL/commits/master
+    # git checkout 917feebfa4fb583360c140e817c266649307ef72
+    if [ -d "/home/rtl/RTL" ]; then
+      echo "# OK - RTL code copy looks good"
+    else
+      echo "# FAIL - code copy did not run correctly"
+      echo "# ABORT - RTL install"
+      exit 1
+    fi
     echo ""
 
+    # install
+    echo "# Run: npm install"
+    export NG_CLI_ANALYTICS=false
+    sudo -u rtl npm install --only=prod
+    if ! [ $? -eq 0 ]; then
+        echo "# FAIL - npm install did not run correctly, aborting"
+        exit 1
+    else
+        echo "# OK - RTL install looks good"
+        echo
+    fi
+
     # setup nginx symlinks
     if ! [ -f /etc/nginx/sites-available/rtl_ssl.conf ]; then
        sudo cp /home/admin/assets/nginx/sites-available/rtl_ssl.conf /etc/nginx/sites-available/rtl_ssl.conf
@@ -170,14 +183,13 @@ EOF
     sudo nginx -t
     sudo systemctl reload nginx
 
-    # open firewall
+    echo "# Updating Firewall"
-    echo "*** Updating Firewall ***"
     sudo ufw allow 3000 comment 'RTL HTTP'
     sudo ufw allow 3001 comment 'RTL HTTPS'
-    echo ""
+    echo
 
-    # install service
+    echo "# Install service"
-    echo "*** Install RTL systemd for ${network} on ${chain} ***"
+    echo "# Install RTL systemd for ${network} on ${chain}"
     cat > /home/admin/RTL.service <<EOF
 # Systemd unit for RTL
 # /etc/systemd/system/RTL.service
@@ -207,6 +219,8 @@ EOF
     echo "OK - the RTL service is now enabled"
   fi
 
+  configRTL
+
   # setting value in raspi blitz config
   sudo sed -i "s/^rtlWebinterface=.*/rtlWebinterface=on/g" /mnt/hdd/raspiblitz.conf
 
@@ -215,6 +229,13 @@ EOF
     # make sure to keep in sync with internet.tor.sh script
     /home/admin/config.scripts/internet.hiddenservice.sh RTL 80 3002 443 3003
   fi
+  source /home/admin/raspiblitz.info
+  if [ "${state}" == "ready" ]; then
+    echo "# OK - the RTL.service is enabled, system is ready so starting service"
+    sudo systemctl start RTL
+  else
+    echo "# OK - the RTL.service is enabled, to start manually use: 'sudo systemctl start RTL'"
+  fi
   exit 0
 fi
 
@@ -241,21 +262,19 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
 
   isInstalled=$(sudo ls /etc/systemd/system/RTL.service 2>/dev/null | grep -c 'RTL.service')
   if [ ${isInstalled} -eq 1 ]; then
-    echo "*** REMOVING RTL ***"
+    echo "# REMOVING RTL"
     sudo systemctl disable RTL
     sudo rm /etc/systemd/system/RTL.service
     # delete user and home directory
     sudo userdel -rf rtl
-    echo "OK RTL removed."
+    echo "# OK RTL removed."
   else
-    echo "RTL is not installed."
+    echo "# RTL is not installed."
   fi
 
   # close ports on firewall
   sudo ufw deny 3000
   sudo ufw deny 3001
-
-  echo "needs reboot to activate new setting"
   exit 0
 fi
 
@@ -294,14 +313,17 @@ if [ "$1" = "update" ]; then
     currentRTLcommit=$(cd /home/rtl/RTL; git describe --tags)
     echo "# Updated RTL to $currentRTLcommit"
   else 
-    echo "# unknown option: $updateOption"
+    echo "# Unknown option: $updateOption"
   fi
+
+  configRTL
+  
   echo
   echo "# Starting the RTL service ... "
   sudo systemctl start RTL
   exit 0
 fi
 
-echo "FAIL - Unknown Parameter $1"
+echo "# FAIL - Unknown Parameter $1"
-echo "may need reboot to run normal again"
+echo "# may need reboot to run normal again"
 exit 1