diff --git a/fdmr-bridge.sh b/fdmr-bridge.sh index e109752..ed1d4a2 100644 --- a/fdmr-bridge.sh +++ b/fdmr-bridge.sh @@ -51,15 +51,15 @@ sed -i "s|VOICE_IDENT:.*|VOICE_IDENT: False|g" /opt/FreeDMR-Bridge/FreeDMR-SAMP 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://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|PEER_URL:.*|PEER_URL: https://servers.adn.systems/peer_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +sed -i "s|SUBSCRIBER_URL:.*|SUBSCRIBER_URL: https://servers.adn.systems/subscriber_ids.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +sed -i "s|TGID_URL:.*|TGID_URL: https://servers.adn.systems/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://adn.systems/files/file_checksums.json|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +sed -i "s|CHECKSUM_URL:.*|CHECKSUM_URL: https://servers.adn.systems/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://adn.systems/files/server_ids.tsv|g" /opt/FreeDMR-Bridge/FreeDMR-SAMPLE.cfg +sed -i "s|SERVER_ID_URL:.*|SERVER_ID_URL: https://servers.adn.systems/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 2f9b23d..6cb92a6 100644 --- a/install.sh +++ b/install.sh @@ -344,8 +344,8 @@ sed -i "s/www\/html/www\/fdmr/g" /opt/FDMR-Monitor/sysinfo/*.* cd /opt/FDMR-Monitor/ cp /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg /opt/FDMR-Monitor/fdmr-mon.cfg ############################### -#wget -O /opt/FDMR-Monitor/html/img/logo.png https://adn.systems/files/logo1.png -#wget -O /opt/FDMR-Monitor/html/favicon.ico https://adn.systems/files/ADN_37x18_01.ico +#wget -O /opt/FDMR-Monitor/html/img/logo.png https://servers.adn.systems/logo1.png +#wget -O /opt/FDMR-Monitor/html/favicon.ico https://servers.adn.systems/ADN_37x18_01.ico # sudo cat > /opt/FDMR-Monitor/html/buttons.php <<- "EOF" @@ -581,9 +581,9 @@ sed -i "s/configFile =.*/configFile = '\/opt\/FDMR-Monitor2\/fdmr-mon.cfg';/g" / sed -i "s/PRIVATE_NETWORK = True/PRIVATE_NETWORK = False/g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg variable2=$(date +'%Y' | tail -c 5) #sed -i "s/CS8ABG<\/a> Dash/FDMR-Monitor2<\/a> by CS8ABG<\/a>, FreeDMR<\/a> by G7RZU hacknix<\/a>, Script project: FDMR+<\/a>/g" /opt/FDMR-Monitor2/html/include/footer.php -sed -i "s|SUBSCRIBER_URL.*|SUBSCRIBER_URL = https://adn.systems/files/subscriber_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg -sed -i "s|TGID_URL.*|TGID_URL = https://adn.systems/files/talkgroup_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg -sed -i "s|PEER_URL.*|PEER_URL = https://adn.systems/files/peer_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg +sed -i "s|SUBSCRIBER_URL.*|SUBSCRIBER_URL = https://servers.adn.systems/subscriber_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg +sed -i "s|TGID_URL.*|TGID_URL = https://servers.adn.systems/talkgroup_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg +sed -i "s|PEER_URL.*|PEER_URL = https://servers.adn.systems/peer_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg sed -i "s/SUBSCRIBER_FILE =.*/SUBSCRIBER_FILE = subscriber_ids.json/g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg sed -i "s/FILES_PATH =.*/FILES_PATH = \/opt\/FDMR-Monitor2\/data/g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg #sed -i "s/#fff/#d1d1d1/g" /opt/FDMR-Monitor2/html/plugins/adminlte/css/adminlte.min.css @@ -595,9 +595,9 @@ sed -i "s/configFile =.*/configFile = '\/opt\/FDMR-Monitor2\/fdmr-mon.cfg';/g" / #wget -q --no-check-certificate -r 'https://docs.google.com/uc?export=download&id=1vsviKjpZmL_mWVEW2UstNODGPl8-uNVo' -O /opt/flags.zip && #sudo unzip -o /opt/flags.zip -d /opt/FDMR-Monitor2/html/flags/ && #rm /opt/flags.zip -#wget -O /opt/FDMR-Monitor2/html/img/logo.png https://adn.systems/files/logo1.png -#wget -O /opt/FDMR-Monitor2/html/img/favicon.ico https://adn.systems/files/ADN_37x18_01.ico -#wget -O /opt/FDMR-Monitor2/html/img/Logo_mini.png https://adn.systems/files/Logo_mini.png +#wget -O /opt/FDMR-Monitor2/html/img/logo.png https://servers.adn.systems/logo1.png +#wget -O /opt/FDMR-Monitor2/html/img/favicon.ico https://servers.adn.systems/ADN_37x18_01.ico +#wget -O /opt/FDMR-Monitor2/html/img/Logo_mini.png https://servers.adn.systems/Logo_mini.png cp fdmr-mon_SAMPLE.cfg fdmr-mon.cfg sudo chmod 644 fdmr-mon.cfg sudo cp /opt/FDMR-Monitor2/html/* /var/www/fdmr2/ -r diff --git a/update.sh b/update.sh index 87a39a4..1efb5fd 100644 --- a/update.sh +++ b/update.sh @@ -757,8 +757,8 @@ cd /opt/FDMR-Monitor/ cd /opt/FDMR-Monitor/ cp /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg /opt/FDMR-Monitor/fdmr-mon.cfg ############################### -#wget -O /opt/FDMR-Monitor/html/img/logo.png https://adn.systems/files/logo1.png -#wget -O /opt/FDMR-Monitor/html/favicon.ico https://adn.systems/files/ADN_37x18_01.ico +#wget -O /opt/FDMR-Monitor/html/img/logo.png https://servers.adn.systems/logo1.png +#wget -O /opt/FDMR-Monitor/html/favicon.ico https://servers.adn.systems/ADN_37x18_01.ico # sudo cat > /opt/FDMR-Monitor/html/buttons.php <<- "EOF" @@ -1036,9 +1036,9 @@ chmod -R 777 /opt/FDMR-Monitor2/* chmod -R +x /opt/FDMR-Monitor2/* sudo chmod 644 /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg -sed -i "s|SUBSCRIBER_URL.*|SUBSCRIBER_URL = https://adn.systems/files/subscriber_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg -sed -i "s|TGID_URL.*|TGID_URL = https://adn.systems/files/talkgroup_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg -sed -i "s|PEER_URL.*|PEER_URL = https://adn.systems/files/peer_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg +sed -i "s|SUBSCRIBER_URL.*|SUBSCRIBER_URL = https://servers.adn.systems/subscriber_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg +sed -i "s|TGID_URL.*|TGID_URL = https://servers.adn.systems/talkgroup_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg +sed -i "s|PEER_URL.*|PEER_URL = https://servers.adn.systems/peer_ids.json|g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg sed -i "s/SUBSCRIBER_FILE =.*/SUBSCRIBER_FILE = subscriber_ids.json/g" /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg sed -i 's/RELOAD_TIME =.*/RELOAD_TIME = 1/' /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg sed -i 's/FREQUENCY =.*/FREQUENCY = 1/' /opt/FDMR-Monitor2/fdmr-mon_SAMPLE.cfg @@ -1061,9 +1061,9 @@ sed -i "s/configFile =.*/configFile = '\/opt\/FDMR-Monitor2\/fdmr-mon.cfg';/g" / #wget -q --no-check-certificate -r 'https://docs.google.com/uc?export=download&id=1vsviKjpZmL_mWVEW2UstNODGPl8-uNVo' -O /opt/flags.zip && #sudo unzip -o /opt/flags.zip -d /opt/FDMR-Monitor2/html/flags/ && #rm /opt/flags.zip -#wget -O /opt/FDMR-Monitor2/html/img/logo.png https://adn.systems/files/logo1.png -#wget -O /opt/FDMR-Monitor2/html/img/favicon.ico https://adn.systems/files/ADN_37x18_01.ico -#wget -O /opt/FDMR-Monitor2/html/img/Logo_mini.png https://adn.systems/files/Logo_mini.png +#wget -O /opt/FDMR-Monitor2/html/img/logo.png https://servers.adn.systems/logo1.png +#wget -O /opt/FDMR-Monitor2/html/img/favicon.ico https://servers.adn.systems/ADN_37x18_01.ico +#wget -O /opt/FDMR-Monitor2/html/img/Logo_mini.png https://servers.adn.systems/Logo_mini.png sudo cp fdmr-mon_SAMPLE.cfg fdmr-mon.cfg sudo chmod 644 fdmr-mon.cfg