moved express config to own file. created configfile.

1 files changed, 13 insertions, 26 deletions

diff --git a/app.js b/app.js
index 9fcfc31..c292af9 100644
--- a/app.js
+++ b/app.js
@@ -5,45 +5,32 @@
 
 var express = require('express')
   , path = require('path')
-  , bcrypt = require('bcrypt')
   , passport = require('passport');
 
+
 var app = express(); // initiates express
 
 /**
  * App configuration
  */
+var port = process.env.PORT || 3000
+  , env = process.env.NODE_ENV || 'development'
+  , config = require('./config/config')[env];
 
-app.configure(function(){
-    // this controls the port the application will be running on.
-    // by adding 'process.enc.PORT' we enable the app to run on automated systems like heroku
-    app.set('port', process.env.PORT || 3000);
-
-    app.set('views', __dirname + '/views'); // sets views to the right directory
-    app.set('view engine', 'ejs'); // initiates viewengine. We use EJS, or embedded js - http://embeddedjs.com/
-    app.use(express.favicon(__dirname + '/public/faviconb.ico')); // sets favicon
-    app.use(express.logger('dev'));
-    app.use(express.bodyParser());
-    app.use(express.cookieParser());
-    app.use(express.session({ secret: 'lsdrghoi4hgqio42nqf2uqi32f3bilu23fl23b' }));
-    app.use(express.methodOverride());
-    app.use(require('less-middleware')({ src: __dirname + '/public' }));
-    app.use(express.static(path.join(__dirname, 'public')));
-    app.use(passport.initialize());
-    app.use(passport.session());
-});
 
-app.configure('development', function(){
-  app.use(express.errorHandler());
-});
 
+/**
+ * Express
+ */
+var app = express();
+// express settings
+require('./config/express')(app, config, passport);
 
 
 /**
  * Routes
  */
-
-require('./router')(app);
+require('./router')(app, config);
 
 
 
@@ -51,8 +38,8 @@ require('./router')(app);
  * Server initiation
  */
 
-app.listen(app.get('port'), function() {
-    console.log("Express server listening on port " + app.get('port'));
+app.listen(port, function() {
+    console.log("Express server listening on port " + port);
 });