allow absolute paths and multiple CAs

diff --git a/server/weblistener.js b/server/weblistener.js
index c67939a2c033abbd687e1a9a98921463fa9b15c1..87bb2e7416ab0eb59a7e10a2c3679de5a5e1cbe8 100644 (file)
--- a/server/weblistener.js
+++ b/server/weblistener.js
@@ -42,13 +42,13 @@ var WebListener = function (web_config, transports) {
 
     if (web_config.ssl) {
         opts = {
-            key: fs.readFileSync(__dirname + '/' + web_config.ssl_key),
-            cert: fs.readFileSync(__dirname + '/' + web_config.ssl_cert)
+            key: fs.readFileSync(web_config.ssl_key),
+            cert: fs.readFileSync(web_config.ssl_cert)
         };
 
         // Do we have an intermediate certificate?
         if (typeof web_config.ssl_ca !== 'undefined') {
-            opts.ca = fs.readFileSync(__dirname + '/' + web_config.ssl_ca);
+            opts.ca = web_config.ssl_ca.map(function (f) { return fs.readFileSync(f); });
         }
 
 
@@ -155,4 +155,4 @@ function newConnection(websocket) {
 
 
 
-module.exports = WebListener;
\ No newline at end of file
+module.exports = WebListener;