diff --git a/fdmr-bridge.sh b/fdmr-bridge.sh index 9e81b95..c3aa7e2 100644 --- a/fdmr-bridge.sh +++ b/fdmr-bridge.sh @@ -28,32 +28,21 @@ git clone https://gitlab.hacknix.net/hacknix/FreeDMR.git /opt/FreeDMR-Bridge mkdir /opt/FreeDMR-Bridge/config sudo chmod +x /opt/FreeDMR-Bridge/* cp /opt/FreeDMR-Bridge/rules_SAMPLE.py /opt/FreeDMR-Bridge/config/rules.py -if [ "$(cat /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg | grep 'TOPO_FILE')" != "" ]; then -sed -i 's/TOPO_FILE:.*/TOPO_FILE: topography.json/' /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +if [ "$(cat /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg | grep 'KEYS_FILE')" != "" ]; then +sudo sed -i 's/KEYS_FILE:.*/KEYS_FILE: keys.json/' /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg else -sed '45 a TOPO_FILE: topography.json' -i /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +sudo sed '45 a KEYS_FILE: keys.json' -i /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg fi +sed -i "s|SUB_MAP_FILE:.*|SUB_MAP_FILE: sub_map.pkl|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s/ANNOUNCEMENT_LANGUAGE:.*/ANNOUNCEMENT_LANGUAGE: es_ES/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s/SINGLE_MODE:.*/SINGLE_MODE: False/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s/VOICE_IDENT:.*/VOICE_IDENT: False/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s/VALIDATE_SERVER_IDS:.*/VALIDATE_SERVER_IDS: False/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s/ALLOW_UNREG_ID:.*/ALLOW_UNREG_ID: True/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s/PROXY_CONTROL:.*/PROXY_CONTROL: False/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s/54000/57000/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -#sed -i "s/TRY_DOWNLOAD:.*/TRY_DOWNLOAD: False/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -#sed -i "s/ENABLED:.*/ENABLED: False/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i 's/file-timed/console-timed/' /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i 's/INFO/DEBUG/' /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i 's/freedmr.log/\/var\/log\/FreeDMR-B\/FreeDMR.log/' /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s/SERVER_ID:.*/SERVER_ID: $variable/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s/4321/4382/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s/CHECKSUM_URL:.*/CHECKSUM_URL:/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s/CHECKSUM_FILE:.*/CHECKSUM_FILE:/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s/SUBSCRIBER_FILE:.*/SUBSCRIBER_FILE: user.json/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s/SUBSCRIBER_URL:.*/SUBSCRIBER_URL: http:\/\/datafiles.ddns.net:8888\/user.json/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s/TGID_URL:.*/TGID_URL: http:\/\/datafiles.ddns.net:8888\/talkgroup_ids.json/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s/PEER_FILE:.*/PEER_FILE: rptrs.json/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s/EER_URL:.*/PEER_URL: https:\/\/database.radioid.net\/static\/rptrs.json/g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i '220s/20/50/' /opt/FreeDMR-Bridge/hotspot_proxy_v2.py cp /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg /opt/FreeDMR-Bridge/config/FreeDMR.cfg sudo cat > /opt/FreeDMR-Bridge/proxy.cfg <<- "EOF" diff --git a/install.sh b/install.sh index c4a9711..668cc0b 100644 --- a/install.sh +++ b/install.sh @@ -309,12 +309,9 @@ else sudo sed '45 a KEYS_FILE: keys.json' -i /opt/FreeDMR/FreeDMR-SAMPLE.cfg fi sed -i '/\[OBP-TEST\]/,/\[/{s/TGID_ACL: [^ ]*/TGID_ACL: DENY:0-82,92-199,800-899,9990-9999,900999/}' /opt/FreeDMR/FreeDMR-SAMPLE.cfg -#sed -i "s|VALIDATE_SERVER_IDS:.*|VALIDATE_SERVER_IDS: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|ANNOUNCEMENT_LANGUAGE:.*|ANNOUNCEMENT_LANGUAGE: es_ES|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|SINGLE_MODE:.*|SINGLE_MODE: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|VOICE_IDENT:.*|VOICE_IDENT: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -#sed -i "s|ALLOW_UNREG_ID:.*|ALLOW_UNREG_ID: True|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -#sed -i "s|PROXY_CONTROL:.*|PROXY_CONTROL: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|54000|56400|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|PEER_FILE:.*|PEER_FILE: peer_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|SUBSCRIBER_FILE:.*|SUBSCRIBER_FILE: subscriber_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg diff --git a/update.sh b/update.sh index 03f24b9..6c0eb0c 100644 --- a/update.sh +++ b/update.sh @@ -553,12 +553,9 @@ else sudo sed '45 a KEYS_FILE: keys.json' -i /opt/FreeDMR/FreeDMR-SAMPLE.cfg fi sed -i '/\[OBP-TEST\]/,/\[/{s/TGID_ACL: [^ ]*/TGID_ACL: DENY:0-82,92-199,800-899,9990-9999,900999/}' /opt/FreeDMR/FreeDMR-SAMPLE.cfg -#sed -i "s|VALIDATE_SERVER_IDS:.*|VALIDATE_SERVER_IDS: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|ANNOUNCEMENT_LANGUAGE:.*|ANNOUNCEMENT_LANGUAGE: es_ES|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|SINGLE_MODE:.*|SINGLE_MODE: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|VOICE_IDENT:.*|VOICE_IDENT: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -#sed -i "s|ALLOW_UNREG_ID:.*|ALLOW_UNREG_ID: True|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -#sed -i "s|PROXY_CONTROL:.*|PROXY_CONTROL: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|54000|56400|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|PEER_FILE:.*|PEER_FILE: peer_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|SUBSCRIBER_FILE:.*|SUBSCRIBER_FILE: subscriber_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg @@ -572,7 +569,6 @@ sed -i "s|SERVER_ID_URL:.*|SERVER_ID_URL: https://freedmr-lh.gb7fr.org.uk/json/s sed -i "s|SERVER_ID_FILE:.*|SERVER_ID_FILE: server_ids.tsv|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|CHECKSUM_URL:.*|CHECKSUM_URL: https://guia.sdrchile.cl/freedmr/file_checksums.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|CHECKSUM_FILE:.*|CHECKSUM_FILE: file_checksums.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -#sed -i "s|TRY_DOWNLOAD:.*|TRY_DOWNLOAD: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg # cp /opt/FreeDMR/FreeDMR-SAMPLE.cfg /opt/FreeDMR-SAMPLE.cfg cd /opt/ @@ -580,8 +576,6 @@ sudo cat FreeDMR-SAMPLE.cfg conf.txt obp.txt >> /opt/FreeDMR/config/FreeDMR.cfg sudo sed -i 's/file-timed/console-timed/' /opt/FreeDMR/config/FreeDMR.cfg sudo sed -i 's/INFO/DEBUG/' /opt/FreeDMR/config/FreeDMR.cfg sudo sed -i 's/freedmr.log/\/var\/log\/FreeDMR\/FreeDMR.log/' /opt/FreeDMR/config/FreeDMR.cfg -#sudo sed -i "s/TGID_URL:/#TGID_URL:/g" /opt/FreeDMR/config/FreeDMR.cfg -#sudo sed '37 a TGID_URL: https://freedmr.cymru/talkgroups/talkgroup_ids_json.php' -i /opt/FreeDMR/config/FreeDMR.cfg sudo sed -i "s/SERVER_ID: .*/SERVER_ID: $variable/g" /opt/FreeDMR/config/FreeDMR.cfg rm /opt/conf.txt rm /opt/FreeDMR-SAMPLE.cfg