diff --git a/fdmr-bridge.sh b/fdmr-bridge.sh index 22a0f3f..ce7cbd7 100644 --- a/fdmr-bridge.sh +++ b/fdmr-bridge.sh @@ -42,22 +42,22 @@ sed -i 's/freedmr.log/\/var\/log\/FreeDMR-B\/FreeDMR.log/' /opt/FreeDMR-Bridge/F 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 '220s/20/50/' /opt/FreeDMR-Bridge/hotspot_proxy_v2.py -sed -i "s|VALIDATE_SERVER_IDS:.*|VALIDATE_SERVER_IDS: 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|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|PEER_FILE:.*|PEER_FILE: peer_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s|SUBSCRIBER_FILE:.*|SUBSCRIBER_FILE: subscriber_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s|TGID_FILE:.*|TGID_FILE: talkgroup_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s|PEER_URL:.*|PEER_URL: https://guia.sdrchile.cl/freedmr/peer_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s|SUBSCRIBER_URL:.*|SUBSCRIBER_URL: https://guia.sdrchile.cl/freedmr/subscriber_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s|TGID_URL:.*|TGID_URL: https://guia.sdrchile.cl/freedmr/talkgroup_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +sed -i "s|PEER_URL:.*|PEER_URL: https://adn.systems/files/peer_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +sed -i "s|SUBSCRIBER_URL:.*|SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +sed -i "s|TGID_URL:.*|TGID_URL: https://adn.systems/files/talkgroup_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s|STALE_TIME:.*|STALE_TIME: 1|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s|SUB_MAP_FILE:.*|SUB_MAP_FILE: sub_map.pkl|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s|SERVER_ID_FILE:.*|SERVER_ID_FILE: server_ids.tsv|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s|CHECKSUM_URL:.*|CHECKSUM_URL: https://guia.sdrchile.cl/freedmr/file_checksums.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +sed -i "s|CHECKSUM_URL:.*|CHECKSUM_URL: https://adn.systems/files/file_checksums.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg sed -i "s|CHECKSUM_FILE:.*|CHECKSUM_FILE: file_checksums.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg -sed -i "s|SERVER_ID_URL:.*|SERVER_ID_URL: https://guia.sdrchile.cl/freedmr/server_ids.tsv|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +sed -i "s|SERVER_ID_URL:.*|SERVER_ID_URL: https://adn.systems/files/server_ids.tsv|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg # 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 721a304..7893888 100644 --- a/install.sh +++ b/install.sh @@ -311,22 +311,22 @@ sed -i '/\[OBP-TEST\]/,/\[/{s/TGID_ACL: [^ ]*/TGID_ACL: DENY:0-82,92-199,800-899 sed -i "s|ANNOUNCEMENT_LANGUAGE:.*|ANNOUNCEMENT_LANGUAGE: es_ES|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|54000|56400|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|PROTO_VER:.*|PROTO_VER: 5|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -sed -i "s|VALIDATE_SERVER_IDS:.*|VALIDATE_SERVER_IDS: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +#sed -i "s|VALIDATE_SERVER_IDS:.*|VALIDATE_SERVER_IDS: False|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|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 sed -i "s|TGID_FILE:.*|TGID_FILE: talkgroup_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -sed -i "s|PEER_URL:.*|PEER_URL: https://guia.sdrchile.cl/freedmr/peer_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -sed -i "s|SUBSCRIBER_URL:.*|SUBSCRIBER_URL: https://guia.sdrchile.cl/freedmr/subscriber_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -sed -i "s|TGID_URL:.*|TGID_URL: https://guia.sdrchile.cl/freedmr/talkgroup_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +sed -i "s|PEER_URL:.*|PEER_URL: https://adn.systems/files/peer_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +sed -i "s|SUBSCRIBER_URL:.*|SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +sed -i "s|TGID_URL:.*|TGID_URL: https://adn.systems/files/talkgroup_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|STALE_TIME:.*|STALE_TIME: 1|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|SUB_MAP_FILE:.*|SUB_MAP_FILE: sub_map.pkl|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg 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_URL:.*|CHECKSUM_URL: https://adn.systems/files/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|SERVER_ID_URL:.*|SERVER_ID_URL: https://guia.sdrchile.cl/freedmr/server_ids.tsv|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +sed -i "s|SERVER_ID_URL:.*|SERVER_ID_URL: https://adn.systems/files/server_ids.tsv|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg # wget https://adn.systems/files/adn.ambe -O /opt/FreeDMR/Audio/es_ES/freedmr.ambe cp /opt/FreeDMR/Audio/es_ES/freedmr.ambe /opt/FreeDMR/Audio/en_GB/freedmr.ambe diff --git a/update.sh b/update.sh index 4dd70a6..4a13775 100644 --- a/update.sh +++ b/update.sh @@ -555,22 +555,22 @@ sed -i '/\[OBP-TEST\]/,/\[/{s/TGID_ACL: [^ ]*/TGID_ACL: DENY:0-82,92-199,800-899 sed -i "s|ANNOUNCEMENT_LANGUAGE:.*|ANNOUNCEMENT_LANGUAGE: es_ES|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|54000|56400|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|PROTO_VER:.*|PROTO_VER: 5|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -sed -i "s|VALIDATE_SERVER_IDS:.*|VALIDATE_SERVER_IDS: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +#sed -i "s|VALIDATE_SERVER_IDS:.*|VALIDATE_SERVER_IDS: False|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|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 sed -i "s|TGID_FILE:.*|TGID_FILE: talkgroup_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -sed -i "s|PEER_URL:.*|PEER_URL: https://guia.sdrchile.cl/freedmr/peer_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -sed -i "s|SUBSCRIBER_URL:.*|SUBSCRIBER_URL: https://guia.sdrchile.cl/freedmr/subscriber_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -sed -i "s|TGID_URL:.*|TGID_URL: https://guia.sdrchile.cl/freedmr/talkgroup_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +sed -i "s|PEER_URL:.*|PEER_URL: https://adn.systems/files/peer_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +sed -i "s|SUBSCRIBER_URL:.*|SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +sed -i "s|TGID_URL:.*|TGID_URL: https://adn.systems/files/talkgroup_ids.json|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|STALE_TIME:.*|STALE_TIME: 1|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s|SUB_MAP_FILE:.*|SUB_MAP_FILE: sub_map.pkl|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg 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_URL:.*|CHECKSUM_URL: https://adn.systems/files/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|SERVER_ID_URL:.*|SERVER_ID_URL: https://guia.sdrchile.cl/freedmr/server_ids.tsv|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +sed -i "s|SERVER_ID_URL:.*|SERVER_ID_URL: https://adn.systems/files/server_ids.tsv|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg # wget https://adn.systems/files/adn.ambe -O /opt/FreeDMR/Audio/es_ES/freedmr.ambe cp /opt/FreeDMR/Audio/es_ES/freedmr.ambe /opt/FreeDMR/Audio/en_GB/freedmr.ambe