windhamdavid 4 years ago
parent
commit
75b4efe5dc
2 changed files with 6 additions and 11 deletions
  1. 5 10
      app.js
  2. 1 1
      gulpfile.js

+ 5 - 10
app.js

@@ -1,15 +1,5 @@
 /*global require:true, __dirname:true */
 
-var conf = {
-    port: 8881,
-    debug: false,
-    dbPort: 6379,
-    dbHost: '127.0.0.1',
-    dbOptions: {},
-    mainroom: 'Lobby'
-};
-
-
 var express = require('express');
 var http = require('http');
 var path = require('path');
@@ -18,6 +8,11 @@ var events = require('events');
 var _ = require('underscore');
 var sanitize = require('validator').sanitize;
 
+var config = {
+  development: require('./config-dev.js'),
+  production: require('./config.js')
+};
+
 var app = express(),
     server = http.createServer(app);
     server.listen(conf.port);

+ 1 - 1
gulpfile.js

@@ -97,7 +97,7 @@ var nodemonTask = function() {
     script: 'app.js',
     verbose: true,
     env: { 'NODE_ENV': 'development' },
-    watch: './src/',
+    watch: ['./src/'],
     ext: 'css js html'
   });
 };