ShaYmez
/
RYSEN
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add automatic downloading of tgid file from FreeDMR website to use 

with HBMonitor etc.
This commit is contained in:
Simon 2021-05-31 23:48:05 +01:00
parent 7eb27cd019
commit 3385b89bce
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.py
View File

@ -156,6 +156,7 @@ def build_config(_config_file):
'TGID_FILE': config.get(section, 'TGID_FILE'), 'TGID_FILE': config.get(section, 'TGID_FILE'),
'PEER_URL': config.get(section, 'PEER_URL'), 'PEER_URL': config.get(section, 'PEER_URL'),
'SUBSCRIBER_URL': config.get(section, 'SUBSCRIBER_URL'), 'SUBSCRIBER_URL': config.get(section, 'SUBSCRIBER_URL'),
'TGID_URL': config.get(section, 'TGID_URL'),
'STALE_TIME': config.getint(section, 'STALE_DAYS') * 86400, 'STALE_TIME': config.getint(section, 'STALE_DAYS') * 86400,
}) })

12
docker-configs/docker_install.sh
View File

@ -26,10 +26,10 @@ PATH: ./
PING_TIME: 10 PING_TIME: 10
MAX_MISSED: 3 MAX_MISSED: 3
USE_ACL: True USE_ACL: True
REG_ACL: PERMIT:ALL REG_ACL: DENY:0-100000
SUB_ACL: DENY:0-100000 SUB_ACL: DENY:0-100000
TGID_TS1_ACL: PERMIT:ALL TGID_TS1_ACL: PERMIT:ALL
TGID_TS2_ACL: DENY:0-79 TGID_TS2_ACL: PERMIT:ALL
GEN_STAT_BRIDGES: True GEN_STAT_BRIDGES: True
ALLOW_NULL_PASSPHRASE: True ALLOW_NULL_PASSPHRASE: True
ANNOUNCEMENT_LANGUAGES: en_GB,en_GB_2,en_US,es_ES,es_ES_2,fr_FR,de_DE,dk_DK,it_IT,no_NO,pl_PL,se_SE ANNOUNCEMENT_LANGUAGES: en_GB,en_GB_2,en_US,es_ES,es_ES_2,fr_FR,de_DE,dk_DK,it_IT,no_NO,pl_PL,se_SE
@ -97,7 +97,7 @@ REG_ACL: DENY:1
SUB_ACL: DENY:1 SUB_ACL: DENY:1
TGID_TS1_ACL: PERMIT:ALL TGID_TS1_ACL: PERMIT:ALL
TGID_TS2_ACL: PERMIT:ALL TGID_TS2_ACL: PERMIT:ALL
DEFAULT_UA_TIMER: 60 DEFAULT_UA_TIMER: 10
SINGLE_MODE: True SINGLE_MODE: True
VOICE_IDENT: True VOICE_IDENT: True
TS1_STATIC: TS1_STATIC:
@ -125,10 +125,10 @@ COLORCODE: 1
SLOTS: 1 SLOTS: 1
LATITUDE: 00.0000 LATITUDE: 00.0000
LONGITUDE: 000.0000 LONGITUDE: 000.0000
HEIGHT: 75 HEIGHT: 0
LOCATION: United Kingdom LOCATION: Earth
DESCRIPTION: ECHO DESCRIPTION: ECHO
URL: www.w1abc.org URL: www.freedmr.uk
SOFTWARE_ID: 20170620 SOFTWARE_ID: 20170620
PACKAGE_ID: MMDVM_FreeDMR PACKAGE_ID: MMDVM_FreeDMR
GROUP_HANGTIME: 5 GROUP_HANGTIME: 5

3
hblink.py
View File

@ -849,6 +849,9 @@ def mk_aliases(_config):
# Try updating subscriber aliases file # Try updating subscriber aliases file
result = try_download(_config['ALIASES']['PATH'], _config['ALIASES']['SUBSCRIBER_FILE'], _config['ALIASES']['SUBSCRIBER_URL'], _config['ALIASES']['STALE_TIME']) result = try_download(_config['ALIASES']['PATH'], _config['ALIASES']['SUBSCRIBER_FILE'], _config['ALIASES']['SUBSCRIBER_URL'], _config['ALIASES']['STALE_TIME'])
logger.info('(GLOBAL) %s', result) logger.info('(GLOBAL) %s', result)
#Try updating tgid aliases file
result = try_download(_config['ALIASES']['PATH'], _config['ALIASES']['TGID_FILE'], _config['ALIASES']['TGID_URL'], _config['ALIASES']['STALE_TIME'])
logger.info('(GLOBAL) %s', result)
# Make Dictionaries # Make Dictionaries
peer_ids = mk_id_dict(_config['ALIASES']['PATH'], _config['ALIASES']['PEER_FILE']) peer_ids = mk_id_dict(_config['ALIASES']['PATH'], _config['ALIASES']['PEER_FILE'])