From 2471acdac50f523ee08db91b4636e9568c3caf0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Pe=CC=81rez?= Date: Sun, 12 May 2024 22:00:19 -0400 Subject: [PATCH] Configs --- config.py | 2 +- config/ADN-MINIMAL.cfg | 4 ++-- config/ADN-SAMPLE-commented.cfg | 4 ++-- config/ADN-SAMPLE.cfg | 4 ++-- config/parrot.cfg | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config.py b/config.py index 49cd204..83bbf1c 100755 --- a/config.py +++ b/config.py @@ -176,7 +176,7 @@ def build_config(_config_file): elif section == 'ALIASES': CONFIG['ALIASES'].update({ 'TRY_DOWNLOAD': config.getboolean(section, 'TRY_DOWNLOAD', fallback=True), - 'PATH': config.get(section, 'PATH', fallback='./json/'), + 'PATH': config.get(section, 'PATH', fallback='./data/'), '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'), diff --git a/config/ADN-MINIMAL.cfg b/config/ADN-MINIMAL.cfg index 645ef0b..3c8043a 100755 --- a/config/ADN-MINIMAL.cfg +++ b/config/ADN-MINIMAL.cfg @@ -33,8 +33,8 @@ DEFAULT_UA_TIMER: 60 TS1_STATIC: TS2_STATIC: DEFAULT_REFLECTOR: 0 -SINGLE_MODE: True -VOICE_IDENT: True +SINGLE_MODE: False +VOICE_IDENT: False ANNOUNCEMENT_LANGUAGE: en_GB GENERATOR: 100 ALLOW_UNREG_ID: False diff --git a/config/ADN-SAMPLE-commented.cfg b/config/ADN-SAMPLE-commented.cfg index 3989e91..1c254e8 100755 --- a/config/ADN-SAMPLE-commented.cfg +++ b/config/ADN-SAMPLE-commented.cfg @@ -201,8 +201,8 @@ SUB_ACL: DENY:1 TGID_TS1_ACL: PERMIT:ALL TGID_TS2_ACL: PERMIT:ALL DEFAULT_UA_TIMER: 10 -SINGLE_MODE: True -VOICE_IDENT: True +SINGLE_MODE: False +VOICE_IDENT: False #the next three lines no longer have any effect TS1_STATIC: TS2_STATIC: diff --git a/config/ADN-SAMPLE.cfg b/config/ADN-SAMPLE.cfg index e8add2a..913896f 100755 --- a/config/ADN-SAMPLE.cfg +++ b/config/ADN-SAMPLE.cfg @@ -86,8 +86,8 @@ SUB_ACL: DENY:1 TGID_TS1_ACL: PERMIT:ALL TGID_TS2_ACL: PERMIT:ALL DEFAULT_UA_TIMER: 60 -SINGLE_MODE: True -VOICE_IDENT: True +SINGLE_MODE: False +VOICE_IDENT: False TS1_STATIC: TS2_STATIC: DEFAULT_REFLECTOR: 0 diff --git a/config/parrot.cfg b/config/parrot.cfg index 0628cdf..8506ed7 100644 --- a/config/parrot.cfg +++ b/config/parrot.cfg @@ -47,7 +47,7 @@ TGID_TS1_ACL: PERMIT:ALL TGID_TS2_ACL: PERMIT:ALL GEN_STAT_BRIDGES: False ALLOW_NULL_PASSPHRASE: False -ANNOUNCEMENT_LANGUAGES: es_ES +ANNOUNCEMENT_LANGUAGES: en_GB SERVER_ID: 9990 DATA_GATEWAY: False VALIDATE_SERVER_IDS: False @@ -94,7 +94,7 @@ REPORT_CLIENTS: 127.0.0.1 LOG_FILE: /dev/null LOG_HANDLERS: null LOG_LEVEL: DEBUG -LOG_NAME: HBlink +LOG_NAME: ADN # DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES # Ok, not the TGID, there's no master list I know of to download @@ -103,7 +103,7 @@ LOG_NAME: HBlink # STALE_DAYS is the number of days since the last download before we # download again. Don't be an ass and change this to less than a few days. [ALIASES] -TRY_DOWNLOAD: True +TRY_DOWNLOAD: False PATH: ./data PEER_FILE: peer_ids.json SUBSCRIBER_FILE: subscriber_ids.json