From 145a46dec053ab30e78fd55a35c5689b9ba85f69 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Thu, 19 Apr 2018 08:29:59 -0700
Subject: [PATCH] Use ENV var for dev server
---
scripts/default.env | 1 +
src/hub.js | 3 ++-
src/react-components/hub-create-panel.js | 2 +-
webpack.config.js | 3 ++-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/scripts/default.env b/scripts/default.env
index a1186bbf1..b5dbe2c7c 100644
--- a/scripts/default.env
+++ b/scripts/default.env
@@ -3,3 +3,4 @@
ORIGIN_TRIAL_TOKEN="ArEZ0vY0uMo3pj+oY8Up4u4Hy8QolJwKxG4/2WRhSPnTZRrviiGhzP6/y72nBdsIhdEyoundxqg//KLbs2vGnQoAAABkeyJvcmlnaW4iOiJodHRwczovL3JldGljdWx1bS5pbzo0NDMiLCJmZWF0dXJlIjoiV2ViVlIxLjFNNjIiLCJleHBpcnkiOjE1MjYzNDg2MjEsImlzU3ViZG9tYWluIjp0cnVlfQ=="
ORIGIN_TRIAL_EXPIRES="2018-05-15"
JANUS_SERVER="wss://prod-janus.reticulum.io"
+DEV_RETICULUM_SERVER="dev.reticulum.io"
diff --git a/src/hub.js b/src/hub.js
index cf0f05828..f57b614c4 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -304,7 +304,8 @@ const onReady = async () => {
const socketProtocol = document.location.protocol === "https:" ? "wss:" : "ws:";
const socketPort = qs.phx_port || (process.env.NODE_ENV === "production" ? document.location.port : 443);
const socketHost =
- qs.phx_host || (process.env.NODE_ENV === "production" ? document.location.hostname : "dev.reticulum.io");
+ qs.phx_host ||
+ (process.env.NODE_ENV === "production" ? document.location.hostname : process.env.DEV_RETICULUM_SERVER);
const socketUrl = `${socketProtocol}//${socketHost}${socketPort ? `:${socketPort}` : ""}/socket`;
console.log(`Phoenix Channel URL: ${socketUrl}`);
diff --git a/src/react-components/hub-create-panel.js b/src/react-components/hub-create-panel.js
index 4884bee65..8b172cbf5 100644
--- a/src/react-components/hub-create-panel.js
+++ b/src/react-components/hub-create-panel.js
@@ -41,7 +41,7 @@ class HubCreatePanel extends Component {
let createUrl = "/api/v1/hubs";
if (process.env.NODE_ENV === "development") {
- createUrl = `https://dev.reticulum.io${createUrl}`;
+ createUrl = `https://${process.env.DEV_RETICULUM_SERVER}${createUrl}`;
}
const res = await fetch(createUrl, {
diff --git a/webpack.config.js b/webpack.config.js
index 744ae0728..55bae8213 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -216,7 +216,8 @@ const config = {
new webpack.DefinePlugin({
"process.env": JSON.stringify({
NODE_ENV: process.env.NODE_ENV,
- JANUS_SERVER: process.env.JANUS_SERVER
+ JANUS_SERVER: process.env.JANUS_SERVER,
+ DEV_RETICULUM_SERVER: process.env.DEV_RETICULUM_SERVER
})
})
]
--
GitLab