wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-16 11:22:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Kim Gardner
2018-01-04 17:28:13 -05:00
committed by GitHub
parent c683dd8d32 0ab6cc3a0f
commit ce4ab4e86c
33 changed files with 1121 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.js
+4 -2
View File
@@ -15,6 +15,8 @@ const uniq = require('lodash/uniq');
const ms = require('ms');
const debug = require('debug')('talk:config');
const localAddress = require('ip').address('private');
//==============================================================================
// CONFIG INITIALIZATION
//==============================================================================
@@ -238,10 +240,10 @@ const CONFIG = {
if (process.env.NODE_ENV === 'test') {
if (!CONFIG.ROOT_URL) {
CONFIG.ROOT_URL = 'http://localhost:3001';
CONFIG.ROOT_URL = `http://${localAddress}:3001`;
}
if (!CONFIG.STATIC_URL) {
CONFIG.STATIC_URI = 'http://localhost:3001';
CONFIG.STATIC_URI = `http://${localAddress}:3001`;
}
} else if (!CONFIG.ROOT_URL) {
throw new Error('TALK_ROOT_URL must be provided');