third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-06-07 19:03:10 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch monitor response to HTTPS

Browse Source
This commit is contained in:
AnthorNet 2017-06-29 12:04:03 +02:00
parent 31baab4ae5
commit 5e841fb9c8
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/monitor/index.html
View File

@ -403,8 +403,8 @@
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<!-- Include all compiled plugins (below), or include individual files as needed --> <!-- 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="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 src="http://code.highcharts.com/4.1.5/modules/drilldown.js"></script> <script src="https://code.highcharts.com/5.0.12/modules/drilldown.js"></script>
<script src="./js/eddn.js"></script> <script src="./js/eddn.js"></script>
</body> </body>
</html> </html>

2
contrib/monitor/js/eddn.js
View File

@ -1,6 +1,6 @@
var updateInterval = 60000, var updateInterval = 60000,
monitorEndPoint = 'http://eddn-gateway.elite-markets.net:9091/', monitorEndPoint = 'https://eddn.edcd.io:9091/',
gatewayBottlePort = 8080, gatewayBottlePort = 8080,
relayBottlePort = 9090, relayBottlePort = 9090,

4
contrib/monitor/schemas.html
View File

@ -108,7 +108,7 @@
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<!-- Include all compiled plugins (below), or include individual files as needed --> <!-- 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="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"> <script type="text/javascript">
var makeSlug = function(str) { var makeSlug = function(str) {
@ -135,7 +135,7 @@
} }
$(document).ready(function(){ $(document).ready(function(){
var monitorEndPoint = 'http://eddn-gateway.elite-markets.net:9091/'; var monitorEndPoint = 'https://eddn.edcd.io:9091/';
var chartContainer = $('#schemas .charts'); var chartContainer = $('#schemas .charts');

8
src/eddn/Monitor.py
View File

@ -254,7 +254,13 @@ def main():
loadConfig() loadConfig()
m = Monitor() m = Monitor()
m.start() 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__': if __name__ == '__main__':