From 09630c685029988d3eaf0cc70cc60b8d89481fc0 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 24 May 2022 15:05:50 +0100 Subject: [PATCH] Tidy up --- FreeDMR-SAMPLE-commented.cfg | 5 ++++- FreeDMR-SAMPLE.cfg | 5 ++++- docker-configs/docker_install.sh | 8 ++++++-- loro.cfg | 3 +++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/FreeDMR-SAMPLE-commented.cfg b/FreeDMR-SAMPLE-commented.cfg index 35259e4..7863033 100755 --- a/FreeDMR-SAMPLE-commented.cfg +++ b/FreeDMR-SAMPLE-commented.cfg @@ -112,7 +112,10 @@ PEER_URL: https://www.radioid.net/static/rptrs.json SUBSCRIBER_URL: https://www.radioid.net/static/users.json TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json LOCAL_SUBSCRIBER_FILE: local_subcriber_ids.json -STALE_DAYS: 7 +STALE_DAYS: 1 +SERVER_ID_URL: http://downloads.freedmr.uk/downloads/FreeDMR_Hosts.csv +SERVER_ID_FILE: server_ids.tsv + #Control server shared allstar instance via dial / AMI [ALLSTAR] diff --git a/FreeDMR-SAMPLE.cfg b/FreeDMR-SAMPLE.cfg index 2a0d88e..c82238d 100755 --- a/FreeDMR-SAMPLE.cfg +++ b/FreeDMR-SAMPLE.cfg @@ -36,8 +36,11 @@ PEER_URL: https://www.radioid.net/static/rptrs.json SUBSCRIBER_URL: https://www.radioid.net/static/users.json TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json LOCAL_SUBSCRIBER_FILE: local_subcriber_ids.json -STALE_DAYS: 7 +STALE_DAYS: 1 SUB_MAP_FILE: +SERVER_ID_URL: http://downloads.freedmr.uk/downloads/FreeDMR_Hosts.csv +SERVER_ID_FILE: server_ids.tsv + #Control server shared allstar instance via dial / AMI [ALLSTAR] diff --git a/docker-configs/docker_install.sh b/docker-configs/docker_install.sh index 428bc15..99c245c 100755 --- a/docker-configs/docker_install.sh +++ b/docker-configs/docker_install.sh @@ -33,8 +33,9 @@ TGID_TS1_ACL: PERMIT:ALL 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 +ANNOUNCEMENT_LANGUAGES: SERVER_ID: 0 +DATA_GATEWAY: False [REPORTS] REPORT: True @@ -57,7 +58,10 @@ TGID_FILE: talkgroup_ids.json PEER_URL: https://www.radioid.net/static/rptrs.json SUBSCRIBER_URL: https://www.radioid.net/static/users.json TGID_URL: TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json -STALE_DAYS: 7 +STALE_DAYS: 1 +SERVER_ID_URL: http://downloads.freedmr.uk/downloads/FreeDMR_Hosts.csv +SERVER_ID_FILE: server_ids.tsv + #Control server shared allstar instance via dial / AMI [ALLSTAR] diff --git a/loro.cfg b/loro.cfg index 1cd27bc..e9d5b89 100644 --- a/loro.cfg +++ b/loro.cfg @@ -113,6 +113,9 @@ TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json LOCAL_SUBSCRIBER_FILE: local_subscriber_ids.json STALE_DAYS: 7 SUB_MAP_FILE: +SERVER_ID_URL: http://downloads.freedmr.uk/downloads/FreeDMR_Hosts.csv +SERVER_ID_FILE: server_ids.tsv + #Read further repeater configs from MySQL [MYSQL]