Tidy up docker install - use directories for JSON and logs.

docker-configs/docker-compose.yml

@@ -24,13 +24,11 @@ services:
         mem_reservation: 600m
         volumes:
             - '/etc/freedmr/freedmr.cfg:/opt/freedmr/freedmr.cfg'
-            - '/var/log/freedmr/freedmr.log:/opt/freedmr/freedmr.log'
+            - '/var/log/freedmr/:/opt/freedmr/log/'
             - '/etc/freedmr/rules.py:/opt/freedmr/rules.py'
             #Write JSON files outside of container
-            - '/etc/freedmr/json/talkgroup_ids.json:/opt/freedmr/talkgroup_ids.json'
+            - '/etc/freedmr/json/:/opt/freedmr/json/'
-            - '/etc/freedmr/json/subscriber_ids.json:/opt/freedmr/subscriber_ids.json'
+
-            - '/etc/freedmr/json/peer_ids.json:/opt/freedmr/peer_ids.json'
-            - '/etc/freedmr/json/sub_map.pkl:/opt/freedmr/sub_map.pkl'
         ports:
             - '62031:62031/udp'
             #Change the below to inlude ports used for your OBP(s)
@@ -62,12 +60,9 @@ services:
         volumes:
             #This should be kept to a manageable size from
             #cron or logrotate outisde of the container.
-            - '/var/log/FreeDMRmonitor/lastheard.log:/opt/FreeDMRmonitor/log/lastheard.log'
+            - '/var/log/FreeDMRmonitor/:/opt/FreeDMRmonitor/log/'
-            - '/var/log/FreeDMRmonitor/hbmon.log:/opt/FreeDMRmonitor/log/hbmon.log'
             #Write JSON files outside of container
-            - '/etc/freedmr/json/talkgroup_ids.json:/opt/FreeDMRmonitor/talkgroup_ids.json'
+            - '/etc/freedmr/json/:/opt/FreeDMRmonitor/json/'
-            - '/etc/freedmr/json/subscriber_ids.json:/opt/FreeDMRmonitor/subscriber_ids.json'
-            - '/etc/freedmr/json/peer_ids.json:/opt/FreeDMRmonitor/peer_ids.json'
 
         #Override config file
         #    - '/etc/freedmr/config.py:/opt/FreeDMRmonitor/config.py'

docker-configs/docker-compose_install.sh

@@ -37,14 +37,7 @@ chmod 755 /etc/freedmr &&
 
 echo make json directory...
 mkdir -p /etc/freedmr/json &&
-
+chown 54000:54000 /etc/freedmr/json &&
-echo get json files...
-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 ... 
 cat << EOF > /etc/freedmr/freedmr.cfg
@@ -70,21 +63,21 @@ REPORT_PORT: 4321
 REPORT_CLIENTS: *
 
 [LOGGER]
-LOG_FILE: freedmr.log
+LOG_FILE: log/freedmr.log
 LOG_HANDLERS: file-timed
 LOG_LEVEL: INFO
 LOG_NAME: FreeDMR
 
 [ALIASES]
-TRY_DOWNLOAD: False
+TRY_DOWNLOAD: True
-PATH: ./
+PATH: ./json/
 PEER_FILE: peer_ids.json
 SUBSCRIBER_FILE: subscriber_ids.json
 TGID_FILE: talkgroup_ids.json
 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
+TGID_URL: TGID_URL: https://freedmr.cymru/talkgroups/talkgroup_ids_json.php
-STALE_DAYS: 7
+STALE_DAYS: 1
 LOCAL_SUBSCRIBER_FILE: local_subcriber_ids.json
 SUB_MAP_FILE: sub_map.pkl