Added baseUrl protocol preference

Author: Miel Vander Sande

bin/ldf-server

@@ -22,10 +22,14 @@ var configDefaults = JSON.parse(fs.readFileSync(path.join(__dirname, '../config/
     workers = parseInt(args[2], 10) || config.workers,
     constructors = {};
 
+// Setup protocol
+var protocolBaseUrl = config.baseURL.match(/^(.*?):\/\/.*/);
+config.protocol =  protocolBaseUrl ? protocolBaseUrl[1] : config.protocol;
+
 // Start up a cluster master
 if (cluster.isMaster) {
   // Create workers
-  console.log('Master %d running on http://localhost:%d/.', process.pid, port);
+  console.log('Master %d running on %s://localhost:%d/.', process.pid, config.protocol, port);
   for (var i = 0; i < workers; i++)
     cluster.fork();
 
@@ -170,7 +174,7 @@ else {
   function startWhenReady() {
     if (!--pending) {
       server.listen(port);
-      console.log('Worker %d running on http://localhost:%d/.', process.pid, port);
+      console.log('Worker %d running on %s://localhost:%d/.', process.pid, config.protocol, port);
     }
   }
 

config/config-defaults.json

@@ -50,10 +50,10 @@
 
   "ssl": {
     "keys" : {
-      "key": "localhost.key'",
+      "key": "localhost.key",
       "ca": [],
       "cert": "localhost.crt.pem"
-    },
+    }
   },
 
   "logging": { "enabled": false, "file": "access.log" }

lib/LinkedDataFragmentsServer.js

@@ -3,32 +3,30 @@
 
 var _ = require('lodash'),
     fs = require('fs'),
-    path = require('path'),
     Util = require('./Util'),
     ErrorController = require('./controllers/ErrorController');
 
 // Creates a new LinkedDataFragmentsServer
 function LinkedDataFragmentsServer(options) {
   // Create the HTTP(S) server
   var server, sockets = 0;
-
   switch (options.protocol) {
   case 'https':
-    var ssl = _.assign(options.ssl || {},
-      _.mapValues(ssl.keys || {},
+    var ssl = options.ssl || {};
+
+    var httpsOptions = _.mapValues(ssl.keys || {},
       function (v) {
         return _.isArray(v) ? _.map(v, function (w) { return fs.readFileSync(w, 'ascii'); }) :  fs.readFileSync(v, 'ascii');
-      })
-    );
+      });
 
-    server = require('https').createServer(ssl);
+    server = require('https').createServer(httpsOptions);
     break;
   case 'http':
     server = require('http').createServer();
+    break;
   default:
     throw new Error('The configured protocol ' + options.protocol + ' is invalid.');
   }
-  server._protocol = protocol;
 
   for (var member in LinkedDataFragmentsServer.prototype)
     server[member] = LinkedDataFragmentsServer.prototype[member];

test/LinkedDataFragmentsServer-test.js

@@ -23,6 +23,7 @@ describe('LinkedDataFragmentsServer', function () {
       server = new LinkedDataFragmentsServer({
         controllers: [controller],
         log: sinon.stub(),
+        protocol: 'http',
         response: {
           headers: {
             'Access-Control-Allow-Origin': '*',
@@ -127,6 +128,7 @@ describe('LinkedDataFragmentsServer', function () {
       };
       server = new LinkedDataFragmentsServer({
         controllers: [controllerA, controllerB],
+        protocol: 'http',
         log: sinon.stub(),
       });
       client = request.agent(server);