ShaYmez
/
HBMonv2
mirror of https://github.com/ShaYmez/HBMonv2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "SSL and nonSSL at the same time." 

This reverts commit 15a966ad5e.
This commit is contained in:
Catalin Vatra 2021-05-21 14:05:13 +03:00
parent 15a966ad5e
commit aa8472994d
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
html/scripts/hbmon.js
View File

@ -11,15 +11,9 @@
masters_table = document.getElementById('masters');
opb_table = document.getElementById('opb');
peers_table = document.getElementById('peers');
// Use both https and http protocols
if (window.location.protocol != "https:") {
wsuri = "ws://" + window.location.hostname + ":9000";
}
else {
wsuri = (((window.location.protocol === "https:") ? "wss://" : "ws://") + window.location.hostname + ":9001");
}
wsuri = (((window.location.protocol === "https:") ? "wss://" : "ws://") + window.location.hostname + ":9000");
if ("WebSocket" in window) {
sock = new WebSocket(wsuri);
} else if ("MozWebSocket" in window) {

10
monitor.py
View File

@ -40,7 +40,7 @@ from subprocess import check_call, CalledProcessError
# Twisted modules
from twisted.internet.protocol import ReconnectingClientFactory, Protocol
from twisted.protocols.basic import NetstringReceiver
from twisted.internet import reactor, task, ssl
from twisted.internet import reactor, task
import base64
@ -1012,10 +1012,10 @@ if __name__ == '__main__':
# and add load ssl module in line number 43: from twisted.internet import reactor, task, ssl
#
# put certificate https://letsencrypt.org/ used in apache server
certificate = ssl.DefaultOpenSSLContextFactory('/etc/letsencrypt/live/hbmon.dmrserver.org/privkey.pem', '/etc/letsencrypt/live/hbmon.dmrserver.org/cert.pem')
dashboard_server = dashboardFactory('wss://*:9001')
dashboard_server.protocol = dashboard
reactor.listenSSL(9001, dashboard_server,certificate)
#certificate = ssl.DefaultOpenSSLContextFactory('/etc/letsencrypt/live/hbmon.dmrserver.org/privkey.pem', '/etc/letsencrypt/live/hbmon.dmrserver.org/cert.pem')
#dashboard_server = dashboardFactory('wss://*:9000')
#dashboard_server.protocol = dashboard
#reactor.listenSSL(9000, dashboard_server,certificate)
# Create websocket server to push content to clients via http:// non SSL
dashboard_server = dashboardFactory('ws://*:9000')