From 3385b89bce2e94c81829240f8f8182898090d4ec Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Mon, 31 May 2021 23:48:05 +0100
Subject: [PATCH] Add automatic downloading of tgid file from FreeDMR website
 to use with HBMonitor etc.

---
 config.py                        |  1 +
 docker-configs/docker_install.sh | 12 ++++++------
 hblink.py                        |  3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config.py b/config.py
index 448d087..91aa477 100755
--- a/config.py
+++ b/config.py
@@ -156,6 +156,7 @@ def build_config(_config_file):
                     'TGID_FILE': config.get(section, 'TGID_FILE'),
                     'PEER_URL': config.get(section, 'PEER_URL'),
                     'SUBSCRIBER_URL': config.get(section, 'SUBSCRIBER_URL'),
+                    'TGID_URL': config.get(section, 'TGID_URL'),
                     'STALE_TIME': config.getint(section, 'STALE_DAYS') * 86400,
                 })
                 
diff --git a/docker-configs/docker_install.sh b/docker-configs/docker_install.sh
index e3413f5..e9b484c 100755
--- a/docker-configs/docker_install.sh
+++ b/docker-configs/docker_install.sh
@@ -26,10 +26,10 @@ PATH: ./
 PING_TIME: 10
 MAX_MISSED: 3
 USE_ACL: True
-REG_ACL: PERMIT:ALL
+REG_ACL: DENY:0-100000
 SUB_ACL: DENY:0-100000
 TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: DENY:0-79
+TGID_TS2_ACL: PERMIT:ALL
 GEN_STAT_BRIDGES: 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
@@ -97,7 +97,7 @@ REG_ACL: DENY:1
 SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
-DEFAULT_UA_TIMER: 60
+DEFAULT_UA_TIMER: 10
 SINGLE_MODE: True
 VOICE_IDENT: True
 TS1_STATIC:
@@ -125,10 +125,10 @@ COLORCODE: 1
 SLOTS: 1
 LATITUDE: 00.0000
 LONGITUDE: 000.0000
-HEIGHT: 75
-LOCATION: United Kingdom
+HEIGHT: 0
+LOCATION: Earth
 DESCRIPTION: ECHO
-URL: www.w1abc.org
+URL: www.freedmr.uk
 SOFTWARE_ID: 20170620
 PACKAGE_ID: MMDVM_FreeDMR
 GROUP_HANGTIME: 5
diff --git a/hblink.py b/hblink.py
index 56257ee..2e89b92 100755
--- a/hblink.py
+++ b/hblink.py
@@ -849,6 +849,9 @@ def mk_aliases(_config):
         # Try updating subscriber aliases file
         result = try_download(_config['ALIASES']['PATH'], _config['ALIASES']['SUBSCRIBER_FILE'], _config['ALIASES']['SUBSCRIBER_URL'], _config['ALIASES']['STALE_TIME'])
         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
     peer_ids = mk_id_dict(_config['ALIASES']['PATH'], _config['ALIASES']['PEER_FILE'])