From 5e841fb9c883f42092326731c261d22b829b1d2c Mon Sep 17 00:00:00 2001
From: AnthorNet <anthor.net@gmail.com>
Date: Thu, 29 Jun 2017 12:04:03 +0200
Subject: [PATCH] Switch monitor response to HTTPS

---
 contrib/monitor/index.html   | 4 ++--
 contrib/monitor/js/eddn.js   | 2 +-
 contrib/monitor/schemas.html | 4 ++--
 src/eddn/Monitor.py          | 8 +++++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/contrib/monitor/index.html b/contrib/monitor/index.html
index 7673e50..3a195a2 100644
--- a/contrib/monitor/index.html
+++ b/contrib/monitor/index.html
@@ -403,8 +403,8 @@
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-    <script src="http://code.highcharts.com/4.1.5/highcharts.js"></script>
-    <script src="http://code.highcharts.com/4.1.5/modules/drilldown.js"></script>
+    <script src="https://code.highcharts.com/5.0.12/highcharts.js"></script>
+    <script src="https://code.highcharts.com/5.0.12/modules/drilldown.js"></script>
     <script src="./js/eddn.js"></script>
 </body>
 </html>
diff --git a/contrib/monitor/js/eddn.js b/contrib/monitor/js/eddn.js
index b8edc64..69b3676 100644
--- a/contrib/monitor/js/eddn.js
+++ b/contrib/monitor/js/eddn.js
@@ -1,6 +1,6 @@
 var updateInterval      = 60000,
 
-    monitorEndPoint     = 'http://eddn-gateway.elite-markets.net:9091/',
+    monitorEndPoint     = 'https://eddn.edcd.io:9091/',
     
     gatewayBottlePort   = 8080,
     relayBottlePort     = 9090,
diff --git a/contrib/monitor/schemas.html b/contrib/monitor/schemas.html
index 94227b0..2a3e86f 100644
--- a/contrib/monitor/schemas.html
+++ b/contrib/monitor/schemas.html
@@ -108,7 +108,7 @@
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-    <script src="http://code.highcharts.com/4.1.5/highcharts.js"></script>
+    <script src="https://code.highcharts.com/5.0.12/highcharts.js"></script>
     
     <script type="text/javascript">
     var makeSlug = function(str) {
@@ -135,7 +135,7 @@
     }
 
     $(document).ready(function(){
-        var monitorEndPoint     = 'http://eddn-gateway.elite-markets.net:9091/';
+        var monitorEndPoint     = 'https://eddn.edcd.io:9091/';
         
         var chartContainer = $('#schemas .charts');
         
diff --git a/src/eddn/Monitor.py b/src/eddn/Monitor.py
index 76f40f6..ae0919b 100644
--- a/src/eddn/Monitor.py
+++ b/src/eddn/Monitor.py
@@ -254,7 +254,13 @@ def main():
     loadConfig()
     m = Monitor()
     m.start()
-    bottle_run(host='0.0.0.0', port=9091, server='gevent')
+    bottle_run(
+        host='0.0.0.0', 
+        port=9091, 
+        server='gevent', 
+        certfile='/etc/letsencrypt/live/eddn.edcd.io/fullchain.pem', 
+        keyfile='/etc/letsencrypt/live/eddn.edcd.io/privkey.pem'
+    )
 
 
 if __name__ == '__main__':