Add Sphinx Relay v1.3.8 (beta)

rootfs/standard/etc/systemd/system/sphinxrelay.service

@@ -9,6 +9,7 @@ After=lnd.service
 [Service]
 ExecStartPre=/usr/bin/is_not_shutting_down.sh
 ExecStartPre=/usr/bin/wait_on_lnd.sh
+ExecStartPre=/usr/bin/mynode_pre_sphinxrelay.sh
 WorkingDirectory=/opt/mynode/sphinxrelay
 ExecStart=npm run prod
 
@@ -16,9 +17,9 @@ User=bitcoin
 Group=bitcoin
 Type=simple
 KillMode=control-group
-TimeoutSec=240
+TimeoutSec=60
 Restart=always
-RestartSec=60
+RestartSec=30
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=sphinxrelay

rootfs/standard/usr/bin/mynode_lndconnect.sh

@@ -29,7 +29,7 @@ while true; do
 
     # Find URLs
     LND_TOR_ADDR=$(cat /var/lib/tor/mynode_lnd/hostname)
-    LOCAL_IP_ADDR=$(hostname -I | head -n 1)
+    LOCAL_IP_ADDR=$(hostname -I | head -n 1 | cut -d' ' -f1)
 
     # Generate QR Codes
     lndconnect --lnddir=/mnt/hdd/mynode/lnd -o --bitcoin.mainnet --host=$LOCAL_IP_ADDR

rootfs/standard/usr/bin/mynode_post_upgrade.sh

@@ -95,7 +95,7 @@ $TORIFY apt-get -y -qq install apt-transport-https ca-certificates
 $TORIFY apt-get -y install libgmp-dev automake libtool libltdl-dev libltdl7
 $TORIFY apt-get -y install xorg chromium openbox lightdm openjdk-11-jre libevent-dev ncurses-dev
 $TORIFY apt-get -y install libudev-dev libusb-1.0-0-dev python3-venv gunicorn sqlite3 libsqlite3-dev
-$TORIFY apt-get -y install torsocks python3-requests libsystemd-dev
+$TORIFY apt-get -y install torsocks python3-requests libsystemd-dev libjpeg-dev zlib1g-dev
 
 # Make sure some software is removed
 apt-get -y purge ntp # (conflicts with systemd-timedatectl)

rootfs/standard/usr/bin/mynode_pre_sphinxrelay.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -x
+set -e
+
+LOCAL_IP_ADDR=$(hostname -I | head -n 1 | cut -d' ' -f1)
+
+# Update IP address in config file (local IP)
+if [ -f /mnt/hdd/mynode/sphinxrelay/app.json ]; then
+    sed -i "s/public_url\": \".*/public_url\": \"${LOCAL_IP_ADDR}:53001\",/g" /mnt/hdd/mynode/sphinxrelay/app.json
+fi
+
+exit 0

rootfs/standard/usr/share/mynode/sphinxrelay_app.json

@@ -39,7 +39,7 @@
       "hub_check_invite_url": "https://hub.sphinx.chat/check_invite",
       "media_host": "memes.sphinx.chat",
       "tribes_host": "tribes.sphinx.chat",
-      "public_url": "",
+      "public_url": "REPLACE_WITH_IP:53001",
       "connection_string_path": "connection_string.txt",
       "ssl": {
         "enabled": false,

rootfs/standard/var/www/mynode/settings.py

@@ -175,6 +175,8 @@ def page_status():
     rtl_status_log = get_journalctl_log("rtl")
     lnbits_status_log = get_journalctl_log("lnbits")
     thunderhub_status_log = get_journalctl_log("thunderhub")
+    ckbunker_status_log = get_journalctl_log("ckbunker")
+    sphinxrelay_status_log = get_journalctl_log("sphinxrelay")
     docker_status_log = get_journalctl_log("docker")
     docker_image_build_status_log = get_journalctl_log("docker_images")
 

rootfs/standard/var/www/mynode/templates/includes/apps.html

@@ -243,7 +243,6 @@
             {% endif %}
         </div>
     </div>
-    <!--
     <div class="app_tile">
         <div class="app_status_icon {{ sphinxrelay_status_color }}" id="sphinxrelay_status_icon"></div>
         <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/sphinx.png")}}"/></div>
@@ -263,7 +262,6 @@
             {% endif %}
         </div>
     </div>
-    -->
 </div>
 
 <!-- BETA APPS -->

rootfs/standard/var/www/mynode/templates/sphinxrelay.html

@@ -28,16 +28,10 @@
         <div class="instructions">
             <div class="instructions-header">Instructions to setup Sphinx Relay</div>
             <ol class="instructions-steps">
-                <li>Ensure that Sphinx Relay is enabled and you see "Running" on the status tile.</li>
+                <li>Ensure that Sphinx Relay is enabled and you see "Running" on the status tile</li>
-                <li>Download and install Sphinx from <a href="https://sphinx.chat/" target="_blank">sphinx.chat</a>.</li>
+                <li>Download and install Sphinx from <a href="https://sphinx.chat/" target="_blank">sphinx.chat</a></li>
-                <li>...</li>
+                <li>Paste the Connection String into the Sphinx application</li>
-                <li>...</li>
+                <li>Sphinx should now be connected to your own node!</li>
-                <li>...</li>
-                <li>...</li>
-                <li>...</li>
-                <li>...</li>
-                <li>...</li>
-                <li>...</li>
                 <li>Enjoy!</li>
             </ol>
 

setup/setup_device.sh

@@ -161,6 +161,7 @@ apt -y -qq install apt-transport-https ca-certificates
 apt-get -y install xorg chromium openbox lightdm openjdk-11-jre libevent-dev ncurses-dev
 apt-get -y install zlib1g-dev libudev-dev libusb-1.0-0-dev python3-venv gunicorn
 apt-get -y install sqlite3 libsqlite3-dev torsocks python3-requests libsystemd-dev
+apt-get -y install libjpeg-dev zlib1g-dev
 
 
 # Make sure some software is removed