Merge pull request #37 from polonel/develop

Hotfix for #34 & #36

README.md

@@ -27,7 +27,7 @@ Built on [Node.JS](http://nodejs.org) and [MongoDB](http://www.mongodb.org).
 
 #### Trudesk Virtual Appliance
 The Trudesk Virtual Appliance can quickly deploy to both Virtual Box as well as VMWare. Visit the appliance documentation for more information.
-[Trudesk Virtual Appliance Documentation](http://www.trudesk.io/docs/install_virtual_appliance.html)
+[Trudesk Virtual Appliance Documentation](http://www.trudesk.io/v1/guide/installation.html#Virtual-Appliance)
 
 ### Documentation
 ___Docs are still in development___

app.js

@@ -48,11 +48,12 @@ winston.err = function (err) {
 };
 
 process.on('message', function(msg) {
-    if (msg == 'shutdown') {
+    if (msg === 'shutdown') {
         console.log('Closing all connections...');
 
         if (ws.server)
             ws.server.close();
+
         process.exit(0);
     }
 });
@@ -108,10 +109,6 @@ if (nconf.get('install') || !configExists && !process.env.HEROKU) {
 
 if (!nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
     start();
-} else if (nconf.get('setup') || nconf.get('install') || !configExists && !process.env.HEROKU) {
-    setup();
-} else if (nconf.get('upgrade')) {
-    //upgrade();
 }
 
 function loadConfig() {
@@ -143,28 +140,6 @@ function start() {
     });
 }
 
-function setup() {
-    loadConfig();
-
-    if (nconf.get('setup')) {
-        winston.info('Starting trudesk setup....');
-    } else {
-        winston.warn('Configuration not found!!! Starting trudesk setup....');
-    }
-
-    var install = require('./src/install');
-
-    install.setup(function(err) {
-        if (err) {
-            winston.error('There was a problem completing trudesk setup: ', err.message);
-        } else {
-            winston.info('trudesk Setup Completed. Run \'./trudesk start\' to manually start your trudesk server.');
-        }
-
-        process.exit();
-    })
-}
-
 function dbCallback(err, db) {
     if (err) {
         return start();