addressing ssl/webid issue and fixing port argv

nicola · nicola · commit 52aee37ced7f · 2015-07-11T16:38:18.000+02:00
diff --git a/bin/ldnode.js b/bin/ldnode.js
@@ -70,16 +70,31 @@ var argv = require('nomnom')
   })
   .parse();
 
+// Print version and leave
 if (argv.version) {
   return;
 }
 
-argv.webid = !argv.noWebid;
+// Set up webid
+if (argv.noWebid) {
+  argv.webid = {key: argv.webidKey, cert: argv.webidCert}
+} else {
+  argv.webid = false;
+}
+
+// Set up ssl
+if (argv.noSsl) {
+  argv.ssl = {key: argv.sslKey, cert: argv.sslCert}
+} else {
+  argv.ssl = false;
+}
+
+// Set up debug environment
 process.env.DEBUG = argv.verbose ? 'ldnode:*' : false;
 var debug = require('../logging').server;
 var ldnode = require('../index');
 
-// Signal handling
+// Signal handling (e.g. CTRL+C)
 if (process.platform !== 'win32') {
     // Signal handlers don't work on Windows.
     process.on('SIGINT', function() {
@@ -88,9 +103,9 @@ if (process.platform !== 'win32') {
     });
 }
 
-// Starting ldnode
+// Finally starting ldnode
 var app = ldnode.createServer(argv);
-app.listen(argv.p, function() {
-    debug('LDP started on port ' + argv.p);
+app.listen(argv.port, function() {
+    debug('LDP started on port ' + argv.port);
 });
 
diff --git a/index.js b/index.js
@@ -72,11 +72,12 @@ function createServer(argv) {
 
     var app = ldnode(argv);
     var opts = app.locals.ldp;
-
-    if (app.locals.ldp && app.locals.ldp.webid) {
+  
+    if (opts.ldp && (opts.webid || opts.ssl )) {
+        var ssl = opts.webid || opts.ssl;
         var credentials = {
-            key: fs.readFileSync(opts.privateKey),
-            cert: fs.readFileSync(opts.cert),
+            key: fs.readFileSync(ssl.key),
+            cert: fs.readFileSync(ssl.cert),
             requestCert: true
         };
         debug("Private Key: " + credentials.key);
