From 97ed7ad101402f277d4ca21e39efabbc0f1729e3 Mon Sep 17 00:00:00 2001
From: AnthorNet <anthor.net@gmail.com>
Date: Thu, 29 Jun 2017 14:01:40 +0200
Subject: [PATCH] Add the new Gateway/Relay and make them act in HTTPS

---
 contrib/monitor/js/eddn.js | 6 ++++--
 src/eddn/Gateway.py        | 9 +++++++--
 src/eddn/Relay.py          | 8 +++++++-
 src/eddn/conf/Settings.py  | 6 +++---
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/contrib/monitor/js/eddn.js b/contrib/monitor/js/eddn.js
index 69b3676..7850c60 100644
--- a/contrib/monitor/js/eddn.js
+++ b/contrib/monitor/js/eddn.js
@@ -6,10 +6,12 @@ var updateInterval      = 60000,
     relayBottlePort     = 9090,
     
     gateways            = [
+        'eddn.edcd.io',
         'eddn-gateway.elite-markets.net'
     ], // Must find a way to bind them to monitor
     
     relays              = [
+        'eddn.edcd.io',
         'eddn-relay.elite-markets.net'
     ]; // Must find a way to bind them to monitor
     
@@ -539,7 +541,7 @@ var start       = function(){
         gateway = gateway.replace(':8500', '');
         
         $("select[name=gateways]").append($('<option>', { 
-            value: 'http://' + gateway + ':' + gatewayBottlePort + '/stats/',
+            value: 'https://' + gateway + ':' + gatewayBottlePort + '/stats/',
             text : gateway
         }));
         
@@ -586,7 +588,7 @@ var start       = function(){
     //relays = relays.sort();
     $.each(relays, function(k, relay){
         $("select[name=relays]").append($('<option>', { 
-            value: 'http://' + relay + ':' + relayBottlePort + '/stats/',
+            value: 'https://' + relay + ':' + relayBottlePort + '/stats/',
             text : relay
         }));
                 
diff --git a/src/eddn/Gateway.py b/src/eddn/Gateway.py
index c7d2ce5..eb04866 100644
--- a/src/eddn/Gateway.py
+++ b/src/eddn/Gateway.py
@@ -213,8 +213,13 @@ class MalformedUploadError(Exception):
 def main():
     loadConfig()
     configure()
-    run(host=Settings.GATEWAY_HTTP_BIND_ADDRESS, port=Settings.GATEWAY_HTTP_PORT, server='gevent')
-
+    run(
+        host=Settings.GATEWAY_HTTP_BIND_ADDRESS, 
+        port=Settings.GATEWAY_HTTP_PORT, 
+        server='gevent', 
+        certfile='/etc/letsencrypt/live/eddn.edcd.io/fullchain.pem', 
+        keyfile='/etc/letsencrypt/live/eddn.edcd.io/privkey.pem'
+    )
 
 if __name__ == '__main__':
     main()
diff --git a/src/eddn/Relay.py b/src/eddn/Relay.py
index 58ea46b..d6cc316 100644
--- a/src/eddn/Relay.py
+++ b/src/eddn/Relay.py
@@ -111,7 +111,13 @@ def main():
     loadConfig()
     r = Relay()
     r.start()
-    bottle_run(host='0.0.0.0', port=9090, server='gevent')
+    bottle_run(
+        host='0.0.0.0', 
+        port=9090, 
+        server='gevent', 
+        certfile='/etc/letsencrypt/live/eddn.edcd.io/fullchain.pem', 
+        keyfile='/etc/letsencrypt/live/eddn.edcd.io/privkey.pem'
+    )
 
 
 if __name__ == '__main__':
diff --git a/src/eddn/conf/Settings.py b/src/eddn/conf/Settings.py
index c9a78fc..f710630 100644
--- a/src/eddn/conf/Settings.py
+++ b/src/eddn/conf/Settings.py
@@ -13,7 +13,7 @@ class _Settings(object):
     # Relay settings
     ###############################################################################
 
-    RELAY_RECEIVER_BINDINGS = ["tcp://eddn-gateway.elite-markets.net:8500"]
+    RELAY_RECEIVER_BINDINGS = ["tcp://eddn.edcd.io:8500", "tcp://eddn-gateway.elite-markets.net:8500"]
 
     RELAY_SENDER_BINDINGS = ["tcp://*:9500"]
 
@@ -70,9 +70,9 @@ class _Settings(object):
     #  Monitor settings
     ###############################################################################
 
-    MONITOR_RECEIVER_BINDINGS = ["tcp://eddn-gateway.elite-markets.net:8500"]
+    MONITOR_RECEIVER_BINDINGS = ["tcp://eddn.edcd.io:8500", "tcp://eddn-gateway.elite-markets.net:8500"]
 
-    MONITOR_DB = "/opt/eddn/EDDN_Monitor.s3db"
+    MONITOR_DB = "/home/EDDN_Monitor.s3db"
 
     MONITOR_DECOMPRESS_MESSAGES = True