From 9868a97dbd3ac1a8d2a8e37ddd43c8c29a393f53 Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Tue, 19 Sep 2017 22:03:34 -0700
Subject: [PATCH] Remove a couple config keys that are no longer used

---
 src/config.js | 52 ---------------------------------------------------
 1 file changed, 52 deletions(-)

diff --git a/src/config.js b/src/config.js
index 29cbdf0d..ee6c2674 100644
--- a/src/config.js
+++ b/src/config.js
@@ -231,40 +231,6 @@ function loadPrometheusConfig() {
 
 // I'm sorry
 function preprocessConfig(cfg) {
-    /* Detect 3.0.0-style config and warng the user about it */
-    if ("host" in cfg.http || "port" in cfg.http || "port" in cfg.https) {
-        LOGGER.warn("The method of specifying which IP/port to bind has "+
-                          "changed.  The config loader will try to handle this "+
-                          "automatically, but you should read config.template.yaml "+
-                          "and change your config.yaml to the new format.");
-        cfg.listen = [
-            {
-                ip: cfg.http.host || "0.0.0.0",
-                port: cfg.http.port,
-                http: true
-            },
-            {
-                ip: cfg.http.host || "0.0.0.0",
-                port: cfg.io.port,
-                io: true
-            }
-        ];
-
-        if (cfg.https.enabled) {
-            cfg.listen.push(
-                {
-                    ip: cfg.http.host || "0.0.0.0",
-                    port: cfg.https.port,
-                    https: true,
-                    io: true
-                }
-            );
-        }
-
-        cfg.http["default-port"] = cfg.http.port;
-        cfg.https["default-port"] = cfg.https.port;
-        cfg.io["default-port"] = cfg.io.port;
-    }
     // Root domain should start with a . for cookies
     var root = cfg.http["root-domain"];
     root = root.replace(/^\.*/, "");
@@ -290,24 +256,6 @@ function preprocessConfig(cfg) {
     cfg.http.domain = cfg.http.domain.replace(/\/*$/, "");
     cfg.https.domain = cfg.https.domain.replace(/\/*$/, "");
 
-    // HTTP/HTTPS domains with port numbers
-    if (!cfg.http["full-address"]) {
-        var httpfa = cfg.http.domain;
-        if (cfg.http["default-port"] !== 80) {
-            httpfa += ":" + cfg.http["default-port"];
-        }
-        cfg.http["full-address"] = httpfa;
-    }
-
-    if (!cfg.https["full-address"]) {
-        var httpsfa = cfg.https.domain;
-        if (cfg.https["default-port"] !== 443) {
-            httpsfa += ":" + cfg.https["default-port"];
-        }
-        cfg.https["full-address"] = httpsfa;
-    }
-
-
     // Socket.IO URLs
     cfg.io["ipv4-nossl"] = "";
     cfg.io["ipv4-ssl"] = "";