From 2480ac00363ba57985019ead96d854cfe99bd4b7 Mon Sep 17 00:00:00 2001
From: Tankred Hase <mail@tankredhase.de>
Date: Sat, 6 Apr 2013 16:45:53 +0200
Subject: [PATCH] cleanup server.js

---
 server.js | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/server.js b/server.js
index 30e3c39..ceba203 100644
--- a/server.js
+++ b/server.js
@@ -6,21 +6,16 @@ var express = require('express'),
 	fs = require('fs'),
 	port, app, prot, dev;
 
-// set port
-if (process.argv[2]) {
-	port = process.argv[2];
-} else {
-	port = 8585;
-}
+port = (process.argv[2]) ? process.argv[2] : 8585;
+dev = (process.argv[3] === '--dev');
 
-if (process.argv[3] === '--dev') {
+if (dev) {
 	// development server
-	dev = true;
+	console.log(' > Starting in development mode ...');
 	prot = 'http';
 	app = express();
 } else {
 	// production server
-	dev = false;
 	prot = 'https';
 	app = express({
 		ca: fs.readFileSync('./ssl/sub.class1.server.ca.pem'),
@@ -31,8 +26,12 @@ if (process.argv[3] === '--dev') {
 
 // Server setup
 app.configure(function() {
-	// active content security policy for production
-	if (!dev) {
+	if (dev) {
+		// serve test files in development mode
+		app.use(express['static'](__dirname + '/test'));
+
+	} else {
+		// activate content security policy for production
 		app.use(function(req, res, next) {
 			var csp = "script-src 'self' 'unsafe-eval'; object-src 'none'; style-src 'self' 'unsafe-inline'";
 			res.set('Content-Security-Policy', csp);
@@ -42,10 +41,6 @@ app.configure(function() {
 		});
 	}
 
-	if (dev) {
-		app.use(express['static'](__dirname + '/test'));
-	}
-
 	app.use(express['static'](__dirname + '/src'));
 });