From 4c4d4a1419327aea877460ebe184be443775c82f Mon Sep 17 00:00:00 2001 From: hp3icc Date: Tue, 27 Jan 2026 10:58:26 -0500 Subject: [PATCH] selfcare selfcare by ea5gvk --- config.py | 25 +++++++++++++---------- config/ADN-MINIMAL.cfg | 4 ++-- config/ADN-SAMPLE-commented.cfg | 14 ++++++------- config/ADN-SAMPLE.cfg | 14 ++++++------- config/adn.cfg | 10 ++++----- docker-configs/docker-compose_install.sh | 20 +++++++++--------- docker-configs/docker-compose_install2.sh | 20 +++++++++--------- docker-configs/docker_install.sh | 8 ++++---- 8 files changed, 59 insertions(+), 56 deletions(-) diff --git a/config.py b/config.py index bb7c6a0..4545241 100755 --- a/config.py +++ b/config.py @@ -1,6 +1,9 @@ #!/usr/bin/env python # ############################################################################### +# Copyright (C) 2026 Joaquin Madrid Belando, EA5GVK +# Copyright (C) 2025 Esteban Mackay, HP3ICC +# Copyright (C) 2025 Bruno Farias, CS8ABG # Copyright (C) 2016-2018 Cortney T. Buffington, N0MJS # # This program is free software; you can redistribute it and/or modify @@ -37,12 +40,12 @@ from languages import languages # Does anybody read this stuff? There's a PEP somewhere that says I should do this. -__author__ = 'Cortney T. Buffington, N0MJS' -__copyright__ = '(c) Simon Adlem, G7RZU 2020-2023, Copyright (c) 2016-2018 Cortney T. Buffington, N0MJS and the K0USY Group' -__credits__ = 'Colin Durbridge, G4EML, Steve Zingman, N4IRS; Mike Zingman, N4IRR; Jonathan Naylor, G4KLX; Hans Barthen, DL5DI; Torsten Shultze, DG1HT' +__author__ = 'Cortney T. Buffington, N0MJS, Forked by Simon Adlem - G7RZU, Forked by Esteban Mackay HP3ICC' +__copyright__ = 'Copyright (c) 2016-2019 Cortney T. Buffington, N0MJS and the K0USY Group, Simon Adlem G7RZU 2020-2023, Esteban Mackay, HP3ICC 2024-2026' +__credits__ = 'Colin Durbridge, G4EML, Steve Zingman, N4IRS; Mike Zingman, N4IRR; Jonathan Naylor, G4KLX; Hans Barthen, DL5DI; Torsten Shultze, DG1HT; Jon Lee, G4TSN; Norman Williams, M6NBP, Eric Craw KF7EEL, Simon Adlem - G7RZU, Bruno Farias CS8ABG, Esteban Mackay HP3ICC, Joaquin Madrid Belando EA5GVK' __license__ = 'GNU GPLv3' -__maintainer__ = 'Simon Adlem, G7RZU' -__email__ = 'simon@gb7fr.org.uk' +__maintainer__ = 'Esteban Mackay, HP3ICC' +__email__ = 'setcom40@gmail.com' # Processing of ALS goes here. It's separated from the acl_build function because this # code is hblink config-file format specific, and acl_build is abstracted @@ -184,15 +187,15 @@ def build_config(_config_file): 'PEER_FILE': config.get(section, 'PEER_FILE', fallback='peer_ids.json'), 'SUBSCRIBER_FILE': config.get(section, 'SUBSCRIBER_FILE', fallback='subscriber_ids.json'), 'TGID_FILE': config.get(section, 'TGID_FILE', fallback='talkgroup_ids.json'), - 'PEER_URL': config.get(section, 'PEER_URL', fallback='https://adn.systems/files/peer_ids.json'), - 'SUBSCRIBER_URL': config.get(section, 'SUBSCRIBER_URL', fallback='https://adn.systems/files/subscriber_ids.json'), - 'TGID_URL': config.get(section, 'TGID_URL', fallback='https://adn.systems/files/talkgroup_ids.json'), + 'PEER_URL': config.get(section, 'PEER_URL', fallback='https://servers.adn.systems/peer_ids.json'), + 'SUBSCRIBER_URL': config.get(section, 'SUBSCRIBER_URL', fallback='https://servers.adn.systems/subscriber_ids.json'), + 'TGID_URL': config.get(section, 'TGID_URL', fallback='https://servers.adn.systems/talkgroup_ids.json'), 'STALE_TIME': config.getint(section, 'STALE_DAYS', fallback=1) * 86400, 'SUB_MAP_FILE': config.get(section, 'SUB_MAP_FILE', fallback='sub_map.pkl'), 'LOCAL_SUBSCRIBER_FILE': config.get(section, 'LOCAL_SUBSCRIBER_FILE', fallback='local_subscribers.json'), - 'SERVER_ID_URL': config.get(section, 'SERVER_ID_URL', fallback='https://adn.systems/files/server_ids.tsv'), + 'SERVER_ID_URL': config.get(section, 'SERVER_ID_URL', fallback='https://servers.adn.systems/server_ids.tsv'), 'SERVER_ID_FILE': config.get(section, 'SERVER_ID_FILE', fallback='server_ids.tsv'), - 'CHECKSUM_URL': config.get(section, 'CHECKSUM_URL', fallback='https://adn.systems/files/file_checksums.json'), + 'CHECKSUM_URL': config.get(section, 'CHECKSUM_URL', fallback='https://servers.adn.systems/file_checksums.json'), 'CHECKSUM_FILE': config.get(section, 'CHECKSUM_FILE', fallback='file_checksums.json'), 'KEYS_FILE': config.get(section, 'KEYS_FILE', fallback='keys.json') }) @@ -315,7 +318,7 @@ def build_config(_config_file): 'MAX_PEERS': config.getint(section, 'MAX_PEERS', fallback=1), 'IP': config.get(section, 'IP', fallback='127.0.0.1'), 'PORT': config.getint(section, 'PORT', fallback=56400), - 'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE', fallback=''), 'utf-8'), + 'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE', fallback='passw0rd'), 'utf-8'), 'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME',fallback=5), 'USE_ACL': config.getboolean(section, 'USE_ACL', fallback=False), 'REG_ACL': config.get(section, 'REG_ACL', fallback=''), diff --git a/config/ADN-MINIMAL.cfg b/config/ADN-MINIMAL.cfg index 6447324..75097e3 100755 --- a/config/ADN-MINIMAL.cfg +++ b/config/ADN-MINIMAL.cfg @@ -81,7 +81,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: 127.0.0.1 PORT: 54917 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 5 USE_ACL: True REG_ACL: DENY:1 @@ -108,7 +108,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: PORT: 52555 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 0 USE_ACL: True REG_ACL: DENY:1 diff --git a/config/ADN-SAMPLE-commented.cfg b/config/ADN-SAMPLE-commented.cfg index d630906..debc536 100755 --- a/config/ADN-SAMPLE-commented.cfg +++ b/config/ADN-SAMPLE-commented.cfg @@ -117,11 +117,11 @@ PATH: ./data/ PEER_FILE: peer_ids.json SUBSCRIBER_FILE: subscriber_ids.json TGID_FILE: talkgroup_ids.json -PEER_URL: https://adn.systems/files/peer_ids.json -SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json -TGID_URL: https://adn.systems/files/talkgroup_ids.json -SERVER_ID_URL: https://adn.systems/files/server_ids.tsv -CHECKSUM_URL: https://adn.systems/files/file_checksums.json +PEER_URL: https://servers.adn.systems/peer_ids.json +SUBSCRIBER_URL: https://servers.adn.systems/subscriber_ids.json +TGID_URL: https://servers.adn.systems/talkgroup_ids.json +SERVER_ID_URL: https://servers.adn.systems/server_ids.tsv +CHECKSUM_URL: https://servers.adn.systems/file_checksums.json LOCAL_SUBSCRIBER_FILE: subscriber_ids.json STALE_DAYS: 1 SUB_MAP_FILE: sub_map.pkl @@ -243,7 +243,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: 127.0.0.1 PORT: 54917 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 5 USE_ACL: True REG_ACL: DENY:1 @@ -270,7 +270,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: PORT: 52555 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 0 USE_ACL: True REG_ACL: DENY:1 diff --git a/config/ADN-SAMPLE.cfg b/config/ADN-SAMPLE.cfg index d95255d..1171db0 100755 --- a/config/ADN-SAMPLE.cfg +++ b/config/ADN-SAMPLE.cfg @@ -38,11 +38,11 @@ PATH: ./data/ PEER_FILE: peer_ids.json SUBSCRIBER_FILE: subscriber_ids.json TGID_FILE: talkgroup_ids.json -PEER_URL: https://adn.systems/files/peer_ids.json -SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json -TGID_URL: https://adn.systems/files/talkgroup_ids.json -SERVER_ID_URL: https://adn.systems/files/server_ids.tsv -CHECKSUM_URL: https://adn.systems/files/file_checksums.json +PEER_URL: https://servers.adn.systems/peer_ids.json +SUBSCRIBER_URL: https://servers.adn.systems/subscriber_ids.json +TGID_URL: https://servers.adn.systems/talkgroup_ids.json +SERVER_ID_URL: https://servers.adn.systems/server_ids.tsv +CHECKSUM_URL: https://servers.adn.systems/file_checksums.json LOCAL_SUBSCRIBER_FILE: subscriber_ids.json STALE_DAYS: 1 SUB_MAP_FILE: sub_map.pkl @@ -111,7 +111,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: 127.0.0.1 PORT: 54917 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 5 USE_ACL: True REG_ACL: DENY:1 @@ -138,7 +138,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: PORT: 52555 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 0 USE_ACL: True REG_ACL: DENY:1 diff --git a/config/adn.cfg b/config/adn.cfg index cdc80e8..6c6facc 100644 --- a/config/adn.cfg +++ b/config/adn.cfg @@ -38,11 +38,11 @@ PATH: ./data/ PEER_FILE: peer_ids.json SUBSCRIBER_FILE: subscriber_ids.json TGID_FILE: talkgroup_ids.json -PEER_URL: https://adn.systems/files/peer_ids.json -SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json -TGID_URL: https://adn.systems/files/talkgroup_ids.json -SERVER_ID_URL: https://adn.systems/files/server_ids.tsv -CHECKSUM_URL: https://adn.systems/files/file_checksums.json +PEER_URL: https://servers.adn.systems/peer_ids.json +SUBSCRIBER_URL: https://servers.adn.systems/subscriber_ids.json +TGID_URL: https://servers.adn.systems/talkgroup_ids.json +SERVER_ID_URL: https://servers.adn.systems/server_ids.tsv +CHECKSUM_URL: https://servers.adn.systems/file_checksums.json LOCAL_SUBSCRIBER_FILE: subscriber_ids.json STALE_DAYS: 1 SUB_MAP_FILE: sub_map.pkl diff --git a/docker-configs/docker-compose_install.sh b/docker-configs/docker-compose_install.sh index 97c4e76..562f9df 100644 --- a/docker-configs/docker-compose_install.sh +++ b/docker-configs/docker-compose_install.sh @@ -78,11 +78,11 @@ PATH: ./data/ PEER_FILE: peer_ids.json SUBSCRIBER_FILE: subscriber_ids.json TGID_FILE: talkgroup_ids.json -PEER_URL: https://adn.systems/files/peer_ids.json -SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json -TGID_URL: https://adn.systems/files/talkgroup_ids.json -SERVER_ID_URL: https://adn.systems/files/server_ids.tsv -CHECKSUM_URL: https://adn.systems/files/file_checksums.json +PEER_URL: https://servers.adn.systems/peer_ids.json +SUBSCRIBER_URL: https://servers.adn.systems/subscriber_ids.json +TGID_URL: https://servers.adn.systems/talkgroup_ids.json +SERVER_ID_URL: https://servers.adn.systems/server_ids.tsv +CHECKSUM_URL: https://servers.adn.systems/file_checksums.json LOCAL_SUBSCRIBER_FILE: subscriber_ids.json STALE_DAYS: 1 SUB_MAP_FILE: sub_map.pkl @@ -150,7 +150,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: 127.0.0.1 PORT: 54917 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 5 USE_ACL: True REG_ACL: DENY:1 @@ -177,7 +177,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: PORT: 52555 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 0 USE_ACL: True REG_ACL: DENY:1 @@ -237,9 +237,9 @@ LOCAL_PEER_FILE = local_peer_ids.json LOCAL_TGID_FILE = local_talkgroup_ids.json # Number of days before we reload DMR-MARC database files. RELOAD_TIME = 1 -PEER_URL = https://adn.systems/files/peer_ids.json -SUBSCRIBER_URL = https://adn.systems/files/subscriber_ids.json -TGID_URL = https://adn.systems/files/talkgroup_ids.json +PEER_URL = https://servers.adn.systems/peer_ids.json +SUBSCRIBER_URL = https://servers.adn.systems/subscriber_ids.json +TGID_URL = https://servers.adn.systems/talkgroup_ids.json diff --git a/docker-configs/docker-compose_install2.sh b/docker-configs/docker-compose_install2.sh index 6d1b2f1..9402fea 100644 --- a/docker-configs/docker-compose_install2.sh +++ b/docker-configs/docker-compose_install2.sh @@ -79,11 +79,11 @@ PATH: ./data/ PEER_FILE: peer_ids.json SUBSCRIBER_FILE: subscriber_ids.json TGID_FILE: talkgroup_ids.json -PEER_URL: https://adn.systems/files/peer_ids.json -SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json -TGID_URL: https://adn.systems/files/talkgroup_ids.json -SERVER_ID_URL: https://adn.systems/files/server_ids.tsv -CHECKSUM_URL: https://adn.systems/files/file_checksums.json +PEER_URL: https://servers.adn.systems/peer_ids.json +SUBSCRIBER_URL: https://servers.adn.systems/subscriber_ids.json +TGID_URL: https://servers.adn.systems/talkgroup_ids.json +SERVER_ID_URL: https://servers.adn.systems/server_ids.tsv +CHECKSUM_URL: https://servers.adn.systems/file_checksums.json LOCAL_SUBSCRIBER_FILE: subscriber_ids.json STALE_DAYS: 1 SUB_MAP_FILE: sub_map.pkl @@ -151,7 +151,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: 127.0.0.1 PORT: 54917 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 5 USE_ACL: True REG_ACL: DENY:1 @@ -178,7 +178,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: PORT: 52555 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 0 USE_ACL: True REG_ACL: DENY:1 @@ -249,9 +249,9 @@ LOCAL_PEER_FILE = local_peer_ids.json LOCAL_TGID_FILE = local_talkgroup_ids.json # Number of days before we reload DMR-MARC database files. RELOAD_TIME = 1 -PEER_URL = https://adn.systems/files/peer_ids.json -SUBSCRIBER_URL = https://adn.systems/files/subscriber_ids.json -TGID_URL = https://adn.systems/files/talkgroup_ids.json +PEER_URL = https://servers.adn.systems/peer_ids.json +SUBSCRIBER_URL = https://servers.adn.systems/subscriber_ids.json +TGID_URL = https://servers.adn.systems/talkgroup_ids.json [LOGGER] # Settings for log files diff --git a/docker-configs/docker_install.sh b/docker-configs/docker_install.sh index d534736..9330a01 100755 --- a/docker-configs/docker_install.sh +++ b/docker-configs/docker_install.sh @@ -121,7 +121,7 @@ MAX_PEERS: 1 EXPORT_AMBE: False IP: 127.0.0.1 PORT: 54917 -PASSPHRASE: +PASSPHRASE: passw0rd GROUP_HANGTIME: 5 USE_ACL: True REG_ACL: DENY:1 @@ -180,9 +180,9 @@ LOCAL_PEER_FILE = local_peer_ids.json LOCAL_TGID_FILE = local_talkgroup_ids.json # Number of days before we reload DMR-MARC database files. RELOAD_TIME = 1 -PEER_URL = https://adn.systems/files/peer_ids.json -SUBSCRIBER_URL = https://adn.systems/files/subscriber_ids.json -TGID_URL = https://adn.systems/files/talkgroup_ids.json +PEER_URL = https://servers.adn.systems/peer_ids.json +SUBSCRIBER_URL = https://servers.adn.systems/subscriber_ids.json +TGID_URL = https://servers.adn.systems/talkgroup_ids.json