dominic/MMDVMHost-Websocketboard
1
0
Fork 0
Code Releases Activity

Merge pull request #22 from dl8tu/patch-1

Browse source 
added ssl stuff
This commit is contained in:
Kim - DG9VH 2021-03-14 12:02:06 +01:00 committed by GitHub
commit 35f37956b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
logtailer.ini
View file

@ -7,6 +7,11 @@ Host=0.0.0.0
# new WebSocket("ws://" + window.location.hostname ... # new WebSocket("ws://" + window.location.hostname ...
Port=5678 Port=5678
# set to True if SSL will be used
Ssl=False
SslCert=/path/to/cert
SslKey=/path/to/keyfile
# This defines the maximum amount of loglines to be sent on initial opening of the dashboard # This defines the maximum amount of loglines to be sent on initial opening of the dashboard
MaxLines=500 MaxLines=500

12
logtailer.py
View file

@ -15,6 +15,7 @@ from urllib.parse import urlparse, parse_qs
from ansi2html import Ansi2HTMLConverter from ansi2html import Ansi2HTMLConverter
from os import popen from os import popen
import psutil import psutil
import ssl
import functools import functools
from http import HTTPStatus from http import HTTPStatus
import subprocess import subprocess
@ -332,11 +333,18 @@ def log_close(websocket, path, exception=None):
def websocketserver(): def websocketserver():
start_server = websockets.serve(view_log, config['DEFAULT']['Host'], config['DEFAULT']['Port']) if (config['DEFAULT']['Ssl'] == "True"):
ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
cert_pem = config['DEFAULT']['SslCert']
key_pem = config['DEFAULT']['SslKey']
ssl_context.load_cert_chain(cert_pem, key_pem)
start_server = websockets.serve(view_log, config['DEFAULT']['Host'], config['DEFAULT']['Port'], ssl=ssl_context)
else:
start_server = websockets.serve(view_log, config['DEFAULT']['Host'], config['DEFAULT']['Port'])
asyncio.get_event_loop().run_until_complete(start_server) asyncio.get_event_loop().run_until_complete(start_server)
asyncio.get_event_loop().run_forever() asyncio.get_event_loop().run_forever()
def main(): def main():
dmr_id_lookup = config['MMDVMHost']['DMR_ID_Lookup'] dmr_id_lookup = config['MMDVMHost']['DMR_ID_Lookup']
dmr_id_lookupfile = config['MMDVMHost']['DMR_ID_LookupFile'] dmr_id_lookupfile = config['MMDVMHost']['DMR_ID_LookupFile']