From 5b790718d8afea3991d823d2c5e2059b9a9e762a Mon Sep 17 00:00:00 2001
From: "John \"Elwin\" Edwards" <elwin@rlgallery.org>
Date: Sun, 8 Jan 2017 16:17:11 -0500
Subject: [PATCH] Use either HTTP or HTTPS.

If HTTPS is enabled, RLGWebD will not use insecure HTTP.
---
 rlgwebd      | 27 ++++++++++++++-------------
 rlgwebd.conf |  4 +---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/rlgwebd b/rlgwebd
index 9239d17..0d24806 100755
--- a/rlgwebd
+++ b/rlgwebd
@@ -16,8 +16,7 @@ var WebSocketServer = require("websocket").server;
 /* Default options */
 var rlgwebd_options = { 
   control_socket: "/var/run/rlgwebd.sock",
-  http_port: 8080,
-  https_port: 8081,
+  port: 8080,
   chrootDir: "/var/dgl/",
   username: "rodney",
   static_root: "/var/www/"
@@ -1288,20 +1287,22 @@ ctlServer.listen(rlgwebd_options.control_socket, function () {
     tslog("Could not drop permissions: %s", err);
     process.exit(1);
   }
-  httpServer = http.createServer(webHandler);
-  httpServer.listen(rlgwebd_options.http_port);
-  tslog('rlgwebd running on port %d', rlgwebd_options.http_port); 
-  wsServer = new WebSocketServer({"httpServer": httpServer});
-  wsServer.on("request", wsHandler);
-  tslog('WebSockets are online'); 
   if (rlgwebd_options.use_https) {
-    var httpsServer = https.createServer(tls_options, webHandler);
-    httpsServer.listen(rlgwebd_options.https_port);
-    tslog('TLS running on port %d', rlgwebd_options.https_port); 
-    var wssServer = new WebSocketServer({"httpServer": httpsServer});
-    wssServer.on("request", wsHandler);
+    httpServer = https.createServer(tls_options, webHandler);
+    httpServer.listen(rlgwebd_options.port);
+    tslog('rlgwebd running on port %d (TLS)', rlgwebd_options.port); 
+    wsServer = new WebSocketServer({"httpServer": httpServer});
+    wsServer.on("request", wsHandler);
     tslog('Secure WebSockets are online'); 
   }
+  else {
+    httpServer = http.createServer(webHandler);
+    httpServer.listen(rlgwebd_options.port);
+    tslog('rlgwebd running on port %d', rlgwebd_options.port); 
+    wsServer = new WebSocketServer({"httpServer": httpServer});
+    wsServer.on("request", wsHandler);
+    tslog('WebSockets are online'); 
+  }
   progressWatcher = startProgressWatcher();
   setInterval(pushStatus, 40000);
 });
diff --git a/rlgwebd.conf b/rlgwebd.conf
index 5d67cd5..220ef90 100644
--- a/rlgwebd.conf
+++ b/rlgwebd.conf
@@ -5,9 +5,7 @@
 # Location of the socket for start/stop commands
 #control_socket = /var/run/rlgwebd.sock
 # Port number to bind
-#http_port = 8080
-# Port number for HTTPS
-#https_port = 8081
+#port = 8080
 # Path to the dgamelaunch installation to chroot into
 # If you change this, change the Makefile too
 #chrootDir = /var/dgl/