diff --git a/scripts/default.env b/scripts/default.env index a1186bbf1f20d84c6883a36bedea1e6ac88e4e7c..b5dbe2c7c9ec3b22eba8d36f07c2fbd700bf0cb0 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 cf0f0582858c04091acb3578f1f0da0d9bee79ad..f57b614c42578d0d942148b26d8da4cb917198b9 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 4884bee6518d4234ea9addb55717cd24273bab50..8b172cbf527d9d2548e39ae9bc4c460c706178d5 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 744ae07283f4c8464ac071fd2f71d4a44fee4b3d..55bae82132e8d8611ba8b01ffcddf1ac49109c4b 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 }) }) ]