Added defaults

Author: Miel Vander Sande

config/config-defaults.json

@@ -1,6 +1,7 @@
 {
   "title": "Linked Data Fragments server",
   "baseURL": "/",
+  "protocol": "http",
 
   "port": 3000,
   "workers": 1,
@@ -47,5 +48,13 @@
     ]
   },
 
+  "ssl": {
+    "keys" : {
+      "key": "localhost.key'",
+      "ca": [],
+      "cert": "localhost.crt.pem"
+    },
+  },
+
   "logging": { "enabled": false, "file": "access.log" }
 }

lib/LinkedDataFragmentsServer.js

@@ -10,26 +10,23 @@ var _ = require('lodash'),
 // Creates a new LinkedDataFragmentsServer
 function LinkedDataFragmentsServer(options) {
   // Create the HTTP(S) server
-  var server, sockets = 0,
-      protocol = options.protocol || 'http';
+  var server, sockets = 0;
 
-  switch (protocol) {
+  switch (options.protocol) {
   case 'https':
-    var ssl = options.ssl || {};
-    _.assign(ssl,
-      _.mapValues(_.defaults(ssl.keys || {}, {
-        key: path.join(__dirname, '../localhost.key'),
-        cert: path.join(__dirname, '../localhost.crt'),
-      }),
+    var ssl = _.assign(options.ssl || {},
+      _.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);
     break;
-  default:
+  case 'http':
     server = require('http').createServer();
+  default:
+    throw new Error('The configured protocol ' + options.protocol + ' is invalid.');
   }
   server._protocol = protocol;