Merge pull request #137 from Pomax/bug873064

removed soundcloudness

app/http/server.js

@@ -7,18 +7,18 @@
 // Module dependencies.
 require( "../../lib/extensions/number" );
 
-var express     = require( "express" ),
-    logger      = require( "../../lib/logger" ),
-    util        = require( "util" ),
-    application = require( "./controllers/application" ),
-    env         = require( "../../config/environment" ),
+var application = require( "./controllers/application" ),
+    env = require( "../../config/environment" );
+    express     = require( "express" ),
     helmet      = require( "helmet" ),
     i18n        = require( "i18n-abide" ),
+    lessMiddleWare = require( "less-middleware" ),
+    logger      = require( "../../lib/logger" ),
     nunjucks    = require( "nunjucks" ),
+    path        = require( "path" ),
+    route       = require( "./routes" ),
     userHandle  = require( "../models/user" )( env ),
-    lessMiddleWare = require( "less-middleware" ),
-    route = require( "./routes" ),
-    path = require( "path" );
+    util        = require( "util" );
 
 var http = express(),
     nunjucksEnv = new nunjucks.Environment( new nunjucks.FileSystemLoader( path.join( __dirname, "views" ) ) );

config/environment.js

@@ -1,18 +1,5 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var habitat = require( "habitat" );
-
-// Load config from ".env"
-habitat.load();
-
-var env = new habitat();
-
-var urlutil = require( "url" );
-
-// In here we hack the environment variables that habitat uses based on
-// VCAP_SERVICES provided by CloudFoundry
-require( "./cloudfoundry-env" );
-
-module.exports = env;
+module.exports = (function() {
+  var habitat = require( "habitat" );
+  habitat.load();
+  return new habitat();
+}());