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

Compare commits

base: ShaYmez:bddd08c514e9a0831d38f43ef8d3c484cd8f71cb
Branches Tags
ShaYmez:main
ShaYmez:v2.00-stable
ShaYmez:webserver-python
ShaYmez:TXing-webpython
ShaYmez:v2.0.1
...
compare: ShaYmez:1be6bcec97874cd7c5a1488a803cd3ea1693cce3
Branches Tags
ShaYmez:main
ShaYmez:v2.00-stable
ShaYmez:webserver-python
ShaYmez:TXing-webpython
ShaYmez:v2.0.1

4 Commits
bddd08c514 ... 1be6bcec97

Author SHA1 Message Date
M0VUB 1be6bcec97
Update Dockerfile 
whitespace, more updates to follow
 2022-05-17 02:06:48 +01:00
M0VUB ff5c2edb7c
Update monitor.py 
Update versioning + logging hash
 2022-05-17 02:04:05 +01:00
M0VUB c6128ac5bb
Create entrypoint 
Add entrypoint
 2022-05-17 01:54:30 +01:00
M0VUB 42e7d76b9f
Create Dockerfile 
Add Dockerfile
 2022-05-17 01:50:29 +01:00
3 changed files with 25 additions and 3 deletions
Show Stats Expand all files Collapse all files

17
Dockerfile Normal file
View File

@ -0,0 +1,17 @@
FROM python:3.10-alpine
COPY entrypoint-proxy /entrypoint
RUN adduser -D -u 54001 hbmon && \
apk update && \
apk add git gcc musl-dev libffi-dev libssl-dev cargo && \
cd /opt && \
git clone https://github.com/ShaYmez/HBMonv2.git && \
cd /opt/HBmonv2 && \
pip install --no-cache-dir -r requirements.txt && \
apk del git gcc musl-dev && \
chown -R radio: /opt/HBMonv2
USER hbmon
ENTRYPOINT [ "/entrypoint" ]

2
entrypoint Normal file
View File

@ -0,0 +1,2 @@
cd /opt/HBMonv2
python /opt/HBMonv2/monitor.py

9
monitor.py
View File

@ -23,7 +23,7 @@
###############################################################################
###############################################################################
#
# HBMonitor v2 (2021) Version by Waldek SP2ONG
# HBMonitor v2 (2022) Version by Waldek SP2ONG
#
###############################################################################
@ -958,6 +958,8 @@ class dashboardFactory(WebSocketServerFactory):
######################################################################
#
# LOGGING ROUTINE
#
if __name__ == '__main__':
logging.basicConfig(
@ -975,7 +977,7 @@ if __name__ == '__main__':
logger = logging.getLogger(__name__)
logging.info('monitor.py starting up')
logger.info('\n\n\tCopyright (c) 2016, 2017, 2018, 2019\n\tThe Regents of the K0USY Group. All rights reserved.\n\n\tPython 3 port:\n\t2019 Steve Miller, KC1AWV <smiller@kc1awv.net>\n\n\tHBMonitor v2 SP2ONG 2019-2021\n\n')
logger.info('\n\n\tCopyright (c) 2016, 2017, 2018, 2019\n\tThe Regents of the K0USY Group. All rights reserved.\n\n\tPython 3 port:\n\t2019 Steve Miller, KC1AWV <smiller@kc1awv.net>\n\n\tHBMonitor v2 SP2ONG 2019-2022\n\n')
# Check lastheard.log
if os.path.isfile(LOG_PATH+"lastheard.log"):
try:
@ -1044,11 +1046,12 @@ if __name__ == '__main__':
reactor.connectTCP(HBLINK_IP, HBLINK_PORT, reportClientFactory())
# HBmonitor does not require the use of SSL as no "sensitive data" is sent to it but if you want to use SSL:
# HBMonV2 does not require the use of SSL as no "sensitive data" is sent to it but if you want to use SSL:
# create websocket server to push content to clients via SSL https://
# the web server apache2 should be configured with a signed certificate for example Letsencrypt
# we need install pyOpenSSL required by twisted: pip3 install pyOpenSSL
# and add load ssl module in line number 43: from twisted.internet import reactor, task, ssl
# Use a reverse proxy such as mod_proxy for SSL to work correctly
#
# 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')