From 1ed7b4e9659b4e62a5e91a6d8130474987efb15d Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Sun, 23 Jan 2022 01:28:18 +0000
Subject: [PATCH] tidy up sample configs

---
 FreeDMR-SAMPLE-commented.cfg             | 20 +++++++++++---------
 FreeDMR-SAMPLE.cfg                       |  1 +
 docker-configs/docker-compose_install.sh |  4 +++-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/FreeDMR-SAMPLE-commented.cfg b/FreeDMR-SAMPLE-commented.cfg
index 8eb96d9..94275cd 100755
--- a/FreeDMR-SAMPLE-commented.cfg
+++ b/FreeDMR-SAMPLE-commented.cfg
@@ -46,12 +46,9 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
 GEN_STAT_BRIDGES: False
-ALLOW_NULL_PASSPHRASE: False
+ALLOW_NULL_PASSPHRASE: True
 ANNOUNCEMENT_LANGUAGES:
 SERVER_ID: 0000
-DATA_GATEWAY: False
-
-
 
 # NOT YET WORKING: NETWORK REPORTING CONFIGURATION
 #   Enabling "REPORT" will configure a socket-based reporting
@@ -85,15 +82,19 @@ REPORT_CLIENTS: 127.0.0.1
 #       file
 #       file-timed
 #       syslog
-#   LOG_LEVEL may be any of the standard syslog logging levels, though
-#   as of now, DEBUG, INFO, WARNING and CRITICAL are the only ones
-#   used.
-#
+#   LOG_LEVEL 
+# TRACE - Low-Level logging and packet data
+# DEBUG - self explanatory 
+# INFO - normal log level 
+# WARNING - only abnormal states
+# ERROR - only errors
+# CRITICAL - only serious events
+
 [LOGGER]
 LOG_FILE: /tmp/hblink.log
 LOG_HANDLERS: console-timed
 LOG_LEVEL: DEBUG
-LOG_NAME: HBlink
+LOG_NAME: FreeDMR
 
 # DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES
 # Ok, not the TGID, there's no master list I know of to download
@@ -153,6 +154,7 @@ SUB_ACL: DENY:1
 TGID_ACL: PERMIT:ALL
 RELAX_CHECKS: False
 ENHANCED_OBP: False
+PROTO_VER: 2 
 
 # MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
 # HomeBrew Protocol Master instances go here.
diff --git a/FreeDMR-SAMPLE.cfg b/FreeDMR-SAMPLE.cfg
index 76e7813..e6db880 100755
--- a/FreeDMR-SAMPLE.cfg
+++ b/FreeDMR-SAMPLE.cfg
@@ -61,6 +61,7 @@ SUB_ACL: DENY:1
 TGID_ACL: PERMIT:ALL
 RELAX_CHECKS: True
 ENHANCED_OBP: True
+PROTO_VER: 2
 
 [SYSTEM]
 MODE: MASTER
diff --git a/docker-configs/docker-compose_install.sh b/docker-configs/docker-compose_install.sh
index ac60d18..569f4d9 100644
--- a/docker-configs/docker-compose_install.sh
+++ b/docker-configs/docker-compose_install.sh
@@ -43,6 +43,7 @@ cd /etc/freedmr/json &&
 curl http://downloads.freedmr.uk/downloads/local_subscriber_ids.json -o subscriber_ids.json &&
 curl http://downloads.freedmr.uk/downloads/talkgroup_ids.json -o talkgroup_ids.json &&
 curl https://www.radioid.net/static/rptrs.json -o peer_ids.json &&
+touch /etc/freedmr/json/sub_map.pkl &&
 chmod -R 777 /etc/freedmr/json &&
 
 echo Install /etc/freedmr/freedmr.cfg ... 
@@ -85,7 +86,7 @@ PEER_URL: https://www.radioid.net/static/rptrs.json
 SUBSCRIBER_URL: http://downloads.freedmr.uk/downloads/local_subscriber_ids.json
 TGID_URL: TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json
 STALE_DAYS: 7
-SUB_MAP_FILE:
+SUB_MAP_FILE: sub_map.pkl
 
 [MYSQL]
 USE_MYSQL: False
@@ -110,6 +111,7 @@ SUB_ACL: DENY:1
 TGID_ACL: PERMIT:ALL
 RELAX_CHECKS: True
 ENHANCED_OBP: True
+PROTO_VER: 2
 
 
 [SYSTEM]