From fe6495c2a2d41834dc914408e9ac28b7c24dd5e6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 2 Oct 2017 17:24:30 +0100
Subject: [PATCH] Use a separate port for scuttlebot on the mesh

---
 src/freedombone-app-scuttlebot |  1 +
 src/freedombone-image-mesh     | 31 +++----------------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot
index cd832902..a1c9bce9 100755
--- a/src/freedombone-app-scuttlebot
+++ b/src/freedombone-app-scuttlebot
@@ -37,6 +37,7 @@ SHOW_ICANN_ADDRESS_ON_ABOUT=0
 
 SCUTTLEBOT_VERSION='10.4.6'
 SCUTTLEBOT_PORT=8008
+SCUTTLEBOT_MESH_PORT=8010
 
 scuttlebot_variables=(MY_USERNAME
                       DEFAULT_DOMAIN_NAME
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index bb268f13..6f221587 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -83,6 +83,8 @@ STUNNEL_PORT=3439
 VPN_TLS_PORT=553
 VPN_MESH_TLS_PORT=653
 
+SCUTTLEBOT_MESH_PORT=8010
+
 # Debian stretch has a problem where the formerly predictable wlan0 and eth0
 # device names get assigned random names. This is a hacky workaround.
 # Also adding net.ifnames=0 to kernel options on bootloader may work.
@@ -790,7 +792,7 @@ function initialise_scuttlebot_pub {
 
     echo '{' > /etc/scuttlebot/.ssb/config
     echo "  \"host\": \"${HOSTNAME}\"," >> /etc/scuttlebot/.ssb/config
-    echo "  \"port\": 8008," >> /etc/scuttlebot/.ssb/config
+    echo "  \"port\": ${SCUTTLEBOT_MESH_PORT}," >> /etc/scuttlebot/.ssb/config
     echo '  "timeout": 30000,' >> /etc/scuttlebot/.ssb/config
     echo '  "pub": true,' >> /etc/scuttlebot/.ssb/config
     echo '  "local": true,' >> /etc/scuttlebot/.ssb/config
@@ -810,32 +812,6 @@ function initialise_scuttlebot_pub {
     systemctl restart scuttlebot.service
 }
 
-function add_ssb_icons {
-    if [ ! -d /home/$MY_USERNAME/Desktop ]; then
-        return
-    fi
-
-    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
-    echo 'Name=Social (Offline)' >> /home/$MY_USERNAME/Desktop/social.desktop
-    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
-    echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /home/$MY_USERNAME/Desktop/social.desktop
-    echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
-    echo "Icon=/etc/patchwork/icon_patchwork.png" >> /home/$MY_USERNAME/Desktop/social.desktop
-    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/social.desktop
-    chmod +x /home/$MY_USERNAME/Desktop/social.desktop
-    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop
-
-    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
-    echo 'Name=Audio/Music (Offline)' >> /home/$MY_USERNAME/Desktop/audio.desktop
-    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
-    echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
-    echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
-    echo "Icon=/etc/patchwork/icon_ferment.png" >> /home/$MY_USERNAME/Desktop/audio.desktop
-    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/audio.desktop
-    chmod +x /home/$MY_USERNAME/Desktop/audio.desktop
-    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
-}
-
 # whether to reset the identity
 set_new_identity=
 if [ $2 ]; then
@@ -899,7 +875,6 @@ if [ -f $MESH_INSTALL_SETUP ]; then
     #setup_tahoelafs
     mesh_setup_vpn
     initialise_scuttlebot_pub
-    add_ssb_icons
     setup_ipfs
     mesh_amnesic
     make_root_read_only