Merge branch 'radotzki-https-server-parameters'

Author: sokra

lib/Server.js

@@ -240,14 +240,25 @@ function Server(compiler, options) {
 		features[feature]();
 	}, this);
 
-	this.listeningApp = options.https
-		? https.createServer({
-				// using built-in self-signed certificate
-				key: options.key || fs.readFileSync(path.join(__dirname, "../ssl/server.key")),
-				cert: options.cert || fs.readFileSync(path.join(__dirname, "../ssl/server.crt")),
-				ca: options.ca || fs.readFileSync(path.join(__dirname, "../ssl/ca.crt"))
-			}, app)
-		: http.createServer(app);
+	if (options.https) {
+		// for keep supporting CLI parameters
+		if (typeof options.https === 'boolean') {
+			options.https = {
+				key: options.key,
+				cert: options.cert,
+				ca: options.ca
+			};
+		}
+
+		// using built-in self-signed certificate if no certificate was configured
+		options.https.key = options.https.key || fs.readFileSync(path.join(__dirname, "../ssl/server.key"));
+		options.https.cert = options.https.cert || fs.readFileSync(path.join(__dirname, "../ssl/server.crt"));
+		options.https.ca = options.https.ca || fs.readFileSync(path.join(__dirname, "../ssl/ca.crt"));
+
+		this.listeningApp = https.createServer(options.https, app);
+	} else {
+		this.listeningApp = http.createServer(app);
+	}
 }
 
 Server.prototype.use = function() {