diff --git a/.gitignore b/.gitignore index 01f5a19..d3b2b1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ node_modules/ -/app/config.* -!/app/config.example.js -/server/config.* -!/server/config.example.js +/app/config/ +!/app/config/config.example.js +/server/config/ +!/server/config/config.example.js /server/public/ /server/certs/ !/server/certs/mediasoup-demo.localhost.* diff --git a/app/config.example.js b/app/config/config.example.js similarity index 100% rename from app/config.example.js rename to app/config/config.example.js diff --git a/app/gulpfile.js b/app/gulpfile.js index ea61794..468c6d0 100644 --- a/app/gulpfile.js +++ b/app/gulpfile.js @@ -46,7 +46,8 @@ const BANNER_OPTIONS = currentYear : (new Date()).getFullYear() }; const OUTPUT_DIR = '../server/public'; -const appOptions = require('./config'); +const appOptions = require('./config/config'); +const SERVER_CONFIG = '../server/config/config'; // Set Node 'development' environment (unless externally set). process.env.NODE_ENV = process.env.NODE_ENV || 'development'; @@ -199,7 +200,7 @@ gulp.task('bundle:watch', () => gulp.task('livebrowser', (done) => { - const config = require('../server/config'); + const config = require(SERVER_CONFIG); browserSync( { @@ -220,7 +221,7 @@ gulp.task('livebrowser', (done) => gulp.task('browser', (done) => { - const config = require('../server/config'); + const config = require(SERVER_CONFIG); browserSync( { diff --git a/app/lib/RoomClient.js b/app/lib/RoomClient.js index 62a19fb..c78769a 100644 --- a/app/lib/RoomClient.js +++ b/app/lib/RoomClient.js @@ -15,7 +15,7 @@ import { turnServers, requestTimeout, transportOptions -} from '../config'; +} from '../config/config'; const logger = new Logger('RoomClient'); diff --git a/app/lib/index.jsx b/app/lib/index.jsx index 3fefebe..a74a8e4 100644 --- a/app/lib/index.jsx +++ b/app/lib/index.jsx @@ -12,7 +12,7 @@ import RoomContext from './RoomContext'; import * as cookiesManager from './cookiesManager'; import * as stateActions from './redux/stateActions'; import Room from './components/Room'; -import { loginEnabled } from '../config'; +import { loginEnabled } from '../config/config'; import { store } from './store'; const logger = new Logger(); diff --git a/server/config.example.js b/server/config/config.example.js similarity index 91% rename from server/config.example.js rename to server/config/config.example.js index 873528b..157aca7 100644 --- a/server/config.example.js +++ b/server/config/config.example.js @@ -11,8 +11,8 @@ module.exports = domain : 'localhost', tls : { - cert : `${__dirname}/certs/mediasoup-demo.localhost.cert.pem`, - key : `${__dirname}/certs/mediasoup-demo.localhost.key.pem` + cert : `${__dirname}/../certs/mediasoup-demo.localhost.cert.pem`, + key : `${__dirname}/../certs/mediasoup-demo.localhost.key.pem` }, // Listening port for https server. listeningPort : 443, diff --git a/server/gulpfile.js b/server/gulpfile.js index b19c999..fa03823 100644 --- a/server/gulpfile.js +++ b/server/gulpfile.js @@ -19,7 +19,7 @@ const LINTING_FILES = [ 'gulpfile.js', 'server.js', - 'config.example.js', + 'config/config.example.js', 'lib/**/*.js' ]; diff --git a/server/lib/Room.js b/server/lib/Room.js index 2d5d3ea..283669e 100644 --- a/server/lib/Room.js +++ b/server/lib/Room.js @@ -2,7 +2,7 @@ const EventEmitter = require('events').EventEmitter; const Logger = require('./Logger'); -const config = require('../config'); +const config = require('../config/config'); const MAX_BITRATE = config.mediasoup.maxBitrate || 1000000; const MIN_BITRATE = Math.min(50000, MAX_BITRATE); diff --git a/server/mediasoup.js b/server/mediasoup.js index ba2ad78..99a4862 100644 --- a/server/mediasoup.js +++ b/server/mediasoup.js @@ -3,7 +3,7 @@ const readline = require('readline'); const colors = require('colors/safe'); const repl = require('repl'); const homer = require('./lib/homer'); -const config = require('./config'); +const config = require('./config/config'); // mediasoup server. const mediaServer = mediasoup.Server( diff --git a/server/server.js b/server/server.js index 21f46d1..88547f9 100755 --- a/server/server.js +++ b/server/server.js @@ -4,7 +4,7 @@ process.title = 'multiparty-meeting-server'; -const config = require('./config'); +const config = require('./config/config'); const fs = require('fs'); const https = require('https'); const http = require('http');