From 22f1d5c513c05b4e895772d5d5b0be7f9b870ed4 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Sun, 6 May 2018 09:19:40 -0700
Subject: [PATCH] Fix up protocol for SSL reticulum
---
scripts/build_local_reticulum.sh | 2 +-
src/hub.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/build_local_reticulum.sh b/scripts/build_local_reticulum.sh
index f883958f8..3f5e3a001 100755
--- a/scripts/build_local_reticulum.sh
+++ b/scripts/build_local_reticulum.sh
@@ -4,4 +4,4 @@ if [ ! -e ../reticulum ]; then
echo "This script assumes reticulum is checked out in a sibling to this folder."
fi
-rm -rf ../reticulum/priv/static ; GENERATE_SMOKE_TESTS=true BASE_ASSETS_PATH=http://localhost:4000/ yarn build -- --output-path ../reticulum/priv/static
+rm -rf ../reticulum/priv/static ; GENERATE_SMOKE_TESTS=true BASE_ASSETS_PATH=https://localhost:4000/ yarn build -- --output-path ../reticulum/priv/static
diff --git a/src/hub.js b/src/hub.js
index feb07c11f..e249ffe16 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -360,7 +360,7 @@ const onReady = async () => {
const hubId = qs.hub_id || document.location.pathname.substring(1).split("/")[0];
console.log(`Hub ID: ${hubId}`);
- const socketProtocol = document.location.protocol === "https:" ? "wss:" : "ws:";
+ const socketProtocol = qs.phx_protocol || (document.location.protocol === "https:" ? "wss:" : "ws:");
const [retHost, retPort] = (process.env.DEV_RETICULUM_SERVER || "").split(":");
const isProd = process.env.NODE_ENV === "production";
const socketPort = qs.phx_port || (isProd ? document.location.port : retPort) || "443";
--
GitLab