cleanup server.js

This commit is contained in:
Tankred Hase 2013-04-06 16:45:53 +02:00
parent 7ae1a57888
commit 2480ac0036
1 changed files with 10 additions and 15 deletions

View File

@ -6,21 +6,16 @@ var express = require('express'),
fs = require('fs'), fs = require('fs'),
port, app, prot, dev; port, app, prot, dev;
// set port port = (process.argv[2]) ? process.argv[2] : 8585;
if (process.argv[2]) { dev = (process.argv[3] === '--dev');
port = process.argv[2];
} else {
port = 8585;
}
if (process.argv[3] === '--dev') { if (dev) {
// development server // development server
dev = true; console.log(' > Starting in development mode ...');
prot = 'http'; prot = 'http';
app = express(); app = express();
} else { } else {
// production server // production server
dev = false;
prot = 'https'; prot = 'https';
app = express({ app = express({
ca: fs.readFileSync('./ssl/sub.class1.server.ca.pem'), ca: fs.readFileSync('./ssl/sub.class1.server.ca.pem'),
@ -31,8 +26,12 @@ if (process.argv[3] === '--dev') {
// Server setup // Server setup
app.configure(function() { 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) { app.use(function(req, res, next) {
var csp = "script-src 'self' 'unsafe-eval'; object-src 'none'; style-src 'self' 'unsafe-inline'"; var csp = "script-src 'self' 'unsafe-eval'; object-src 'none'; style-src 'self' 'unsafe-inline'";
res.set('Content-Security-Policy', csp); 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')); app.use(express['static'](__dirname + '/src'));
}); });