mirror of https://github.com/ShaYmez/HBMonv2.git
Compare commits
No commits in common. "1be6bcec97874cd7c5a1488a803cd3ea1693cce3" and "bddd08c514e9a0831d38f43ef8d3c484cd8f71cb" have entirely different histories.
1be6bcec97
...
bddd08c514
17
Dockerfile
17
Dockerfile
|
@ -1,17 +0,0 @@
|
|||
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" ]
|
|
@ -1,2 +0,0 @@
|
|||
cd /opt/HBMonv2
|
||||
python /opt/HBMonv2/monitor.py
|
|
@ -23,7 +23,7 @@
|
|||
###############################################################################
|
||||
###############################################################################
|
||||
#
|
||||
# HBMonitor v2 (2022) Version by Waldek SP2ONG
|
||||
# HBMonitor v2 (2021) Version by Waldek SP2ONG
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
|
@ -958,8 +958,6 @@ class dashboardFactory(WebSocketServerFactory):
|
|||
|
||||
######################################################################
|
||||
#
|
||||
# LOGGING ROUTINE
|
||||
#
|
||||
|
||||
if __name__ == '__main__':
|
||||
logging.basicConfig(
|
||||
|
@ -977,7 +975,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-2022\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-2021\n\n')
|
||||
# Check lastheard.log
|
||||
if os.path.isfile(LOG_PATH+"lastheard.log"):
|
||||
try:
|
||||
|
@ -1046,12 +1044,11 @@ if __name__ == '__main__':
|
|||
reactor.connectTCP(HBLINK_IP, HBLINK_PORT, reportClientFactory())
|
||||
|
||||
|
||||
# HBMonV2 does not require the use of SSL as no "sensitive data" is sent to it but if you want to use SSL:
|
||||
# HBmonitor 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')
|
||||
|
|
Loading…
Reference in New Issue