[STABLE] Allow HTTPS and HTTP and MQTT and SSL MQTT

Author: RickCarlino

app/index.js

@@ -4,6 +4,7 @@ var onReady = require("./on_ready");
 var maybeEnableSSL = require("./security/maybe_enable_ssl");
 
 var input = {
+    allowNonSecure: true,
     port: conf.mqttPort,
     http: { // for teh websockets
         port: conf.httpPort,
@@ -16,7 +17,9 @@ maybeEnableSSL(input)
 var server = new Server(input);
 
 server.on("ready", onReady(server));  //on init it fires up setup()
-
+server.on("ready", function() {
+    console.dir(input);
+});
 var authorizePublish = require("./security/authorize_publish");
 var authorizeSubscribe = require("./security/authorize_subscribe");
 server.authorizePublish = authorizePublish;

app/security/maybe_enable_ssl.js

@@ -2,7 +2,7 @@ var SSL = process.env.SSL_DOMAIN;
 // ALL OF THESE HARDCODED VALUES ARE SET BY LETS ENCTRYPT/
 // CERTBOT. <3 EFF
 var SSL_DIR = `/etc/letsencrypt/live/${SSL}/`;
-// var SSL_MQTT_PORT = 8883;
+var SSL_MQTT_PORT = 8883;
 var HTTPS_PORT = 443;
 var SSL_CERT = SSL_DIR + "cert.pem";
 var SSL_KEY = SSL_DIR + "privkey.pem";
@@ -11,7 +11,7 @@ var log = require("../logger");
 module.exports = function maybeEnableSSL(config) {
     if (SSL) {
         config.secure = config.secure || {};
-        // config.secure.port = SSL_MQTT_PORT;
+        config.secure.port = SSL_MQTT_PORT;
         config.secure.keyPath = SSL_KEY;
         config.secure.certPath = SSL_CERT;