From cfd9a1f80d2c4ab0ce056feb13fd88fa5fa6a32b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 2 Oct 2017 21:57:24 +0100
Subject: [PATCH] Switch to using a different scuttlebot port

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

diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot
index a1c9bce9..85e58e60 100755
--- a/src/freedombone-app-scuttlebot
+++ b/src/freedombone-app-scuttlebot
@@ -36,8 +36,7 @@ SHOW_ON_ABOUT=0
 SHOW_ICANN_ADDRESS_ON_ABOUT=0
 
 SCUTTLEBOT_VERSION='10.4.6'
-SCUTTLEBOT_PORT=8008
-SCUTTLEBOT_MESH_PORT=8010
+SCUTTLEBOT_PORT=8010
 
 scuttlebot_variables=(MY_USERNAME
                       DEFAULT_DOMAIN_NAME
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 6f221587..7430d280 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -83,7 +83,7 @@ STUNNEL_PORT=3439
 VPN_TLS_PORT=553
 VPN_MESH_TLS_PORT=653
 
-SCUTTLEBOT_MESH_PORT=8010
+SCUTTLEBOT_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.
@@ -792,7 +792,7 @@ function initialise_scuttlebot_pub {
 
     echo '{' > /etc/scuttlebot/.ssb/config
     echo "  \"host\": \"${HOSTNAME}\"," >> /etc/scuttlebot/.ssb/config
-    echo "  \"port\": ${SCUTTLEBOT_MESH_PORT}," >> /etc/scuttlebot/.ssb/config
+    echo "  \"port\": ${SCUTTLEBOT_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