From fc926c272fe91947e670894fcbc2c688218d3d07 Mon Sep 17 00:00:00 2001 From: Esteban Mackay Q Date: Sun, 15 Oct 2023 14:54:42 -0500 Subject: [PATCH] update --- install.sh | 41 ++++++++++++++++++++--------------------- update.sh | 36 ++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/install.sh b/install.sh index dcda9c6..2716fa4 100644 --- a/install.sh +++ b/install.sh @@ -326,7 +326,7 @@ sed -i "s/SUBSCRIBER_FILE:.*/SUBSCRIBER_FILE: user.json/g" /opt/FreeDMR/FreeDMR sed -i "s/SUBSCRIBER_URL:.*/SUBSCRIBER_URL: http:\/\/datafiles.ddns.net:8888\/user.json/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s/TGID_URL:.*/TGID_URL: http:\/\/datafiles.ddns.net:8888\/talkgroup_ids.json/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s/PEER_FILE:.*/PEER_FILE: rptrs.json/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -sed -i "s/EER_URL:.*/PEER_URL: https:\/\/database.radioid.net\/static\/rptrs.json/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg +sed -i "s/PEER_URL:.*/PEER_URL: https:\/\/database.radioid.net\/static\/rptrs.json/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg cp /opt/FreeDMR/FreeDMR-SAMPLE.cfg /opt/FreeDMR-SAMPLE.cfg cd /opt/ @@ -405,32 +405,12 @@ sed -i "s/PEER_URL =.*/PEER_URL = https:\/\/freedmr-lh.gb7fr.org.uk\/json\/peer_ sed -i "s/SUBSCRIBER_URL =.*/SUBSCRIBER_URL = http:\/\/datafiles.ddns.net:8888\/user.json/g" /opt/FDMR-Monitor/fdmr-mon.cfg sed -i "s/SUBSCRIBER_FILE =.*/SUBSCRIBER_FILE = subscriber_ids.json/g" /opt/FDMR-Monitor/fdmr-mon.cfg sed -i "s/TGID_URL =.*/TGID_URL = http:\/\/datafiles.ddns.net:8888\/talkgroup_ids.json/g" /opt/FDMR-Monitor/fdmr-mon.cfg -sed -i "s/db_username =.*/db_username = 'hbmon'/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/db_password =.*/db_password = 'hbmon'/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/db_name =.*/db_name = 'hbmon'/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/\/freedmr.cfg/\/config\/FreeDMR.cfg/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/db_selfcare =.*/db_selfcare = ProxyDB('localhost', 'hbmon', 'hbmon', 'hbmon', 3306)/g" /opt/FDMR-Monitor/proxy/proxy_db.py -sed -i "s/USERNAME =.*/USERNAME = hbmon/g" /opt/FDMR-Monitor/proxy/proxy.cfg -sed -i "s/PASSWORD =.*/PASSWORD = hbmon/g" /opt/FDMR-Monitor/proxy/proxy.cfg -sed -i "s/DB_NAME =.*/DB_NAME = hbmon/g" /opt/FDMR-Monitor/proxy/proxy.cfg -sed -i "s/54000/56000/g" /opt/FDMR-Monitor/proxy/proxy_db.py -sed -i "s/54000/56000/g" /opt/FDMR-Monitor/proxy/proxy.cfg -sed -i "s/54100/56099/g" /opt/FDMR-Monitor/proxy/proxy_db.py -sed -i "s/54100/56099/g" /opt/FDMR-Monitor/proxy/proxy.cfg -sed -i "s/54000/56000/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/54100/56099/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/1234567/1234567,1231237,123123701/g" /opt/FDMR-Monitor/proxy/proxy.cfg -################# -cp /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py /opt/FreeDMR/hotspot_proxy_v2.py -cp /opt/FDMR-Monitor/proxy/proxy.cfg /opt/FreeDMR/proxy.cfg -cp /opt/FDMR-Monitor/proxy/proxy_db.py /opt/FreeDMR/proxy_db.py wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1B-M7QNdf1gLVzbTn-Fi5GVPy6GTXcxJ-' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1B-M7QNdf1gLVzbTn-Fi5GVPy6GTXcxJ-" -O /opt/FDMR-Monitor/html/favicon.ico && rm -rf /tmp/cookies.txt && sed '6 a ' -i /opt/FDMR-Monitor/html/index.php wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1evvxLOh8uxKYYLoV0aORjDhFeLF42_S_' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1evvxLOh8uxKYYLoV0aORjDhFeLF42_S_" -O /opt/FDMR-Monitor/html/img/logo.png && rm -rf /tmp/cookies.txt && - # sudo cat > /opt/FDMR-Monitor/html/buttons.php <<- "EOF" @@ -885,6 +865,25 @@ sed -i "s/#fff/#d1d1d1/g" /opt/FDMR-Monitor2/html/plugins/adminlte/css/adminlte sed -i "s/f8f9fa/d0d0d0/g" /opt/FDMR-Monitor2/html/plugins/adminlte/css/adminlte.min.css sed -i "s/configFile =.*/configFile = '\/opt\/FDMR-Monitor2\/fdmr-mon.cfg';/g" /opt/FDMR-Monitor2/html/ssconfunc.php #sed -i "s/configFile =.*/configFile = '\/opt\/FDMR-Monitor2\/fdmr-mon.cfg';/g" /var/www/fdmr2/ssconfunc.php +sed -i "s/db_username =.*/db_username = 'hbmon'/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/db_password =.*/db_password = 'hbmon'/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/db_name =.*/db_name = 'hbmon'/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/\/freedmr.cfg/\/config\/FreeDMR.cfg/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/db_selfcare =.*/db_selfcare = ProxyDB('localhost', 'hbmon', 'hbmon', 'hbmon', 3306)/g" /opt/FDMR-Monitor2/proxy/proxy_db.py +sed -i "s/USERNAME =.*/USERNAME = hbmon/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +sed -i "s/PASSWORD =.*/PASSWORD = hbmon/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +sed -i "s/DB_NAME =.*/DB_NAME = hbmon/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +sed -i "s/54000/56000/g" /opt/FDMR-Monitor2/proxy/proxy_db.py +sed -i "s/54000/56000/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +sed -i "s/54100/56099/g" /opt/FDMR-Monitor2/proxy/proxy_db.py +sed -i "s/54100/56099/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +sed -i "s/54000/56000/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/54100/56099/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/1234567/1234567,1231237,123123701/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +################# +cp /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py /opt/FreeDMR/hotspot_proxy_v2.py +cp /opt/FDMR-Monitor2/proxy/proxy.cfg /opt/FreeDMR/proxy.cfg +cp /opt/FDMR-Monitor2/proxy/proxy_db.py /opt/FreeDMR/proxy_db.py wget -q --no-check-certificate -r 'https://docs.google.com/uc?export=download&id=1cWqClH0FUxV5d-rVnibI_-iCypFnTDb3' -O /opt/FDMR-Monitor2/html/img/bk.jpg && wget -q --no-check-certificate -r 'https://docs.google.com/uc?export=download&id=1vsviKjpZmL_mWVEW2UstNODGPl8-uNVo' -O /opt/flags.zip && diff --git a/update.sh b/update.sh index 35ffcff..df47ed5 100644 --- a/update.sh +++ b/update.sh @@ -550,25 +550,25 @@ cd /opt/FreeDMR/ mv loro.cfg /opt/FreeDMR/playback.cfg sudo sed -i 's/54915/49061/' /opt/FreeDMR/playback.cfg ############# -sed -i "s/db_username =.*/db_username = 'hbmon'/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/db_password =.*/db_password = 'hbmon'/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/db_name =.*/db_name = 'hbmon'/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/\/freedmr.cfg/\/config\/FreeDMR.cfg/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/db_selfcare =.*/db_selfcare = ProxyDB('localhost', 'hbmon', 'hbmon', 'hbmon', 3306)/g" /opt/FDMR-Monitor/proxy/proxy_db.py -sed -i "s/USERNAME =.*/USERNAME = hbmon/g" /opt/FDMR-Monitor/proxy/proxy.cfg -sed -i "s/PASSWORD =.*/PASSWORD = hbmon/g" /opt/FDMR-Monitor/proxy/proxy.cfg -sed -i "s/DB_NAME =.*/DB_NAME = hbmon/g" /opt/FDMR-Monitor/proxy/proxy.cfg -sed -i "s/54000/56000/g" /opt/FDMR-Monitor/proxy/proxy_db.py -sed -i "s/54000/56000/g" /opt/FDMR-Monitor/proxy/proxy.cfg -sed -i "s/54100/56100/g" /opt/FDMR-Monitor/proxy/proxy_db.py -sed -i "s/54100/56100/g" /opt/FDMR-Monitor/proxy/proxy.cfg -sed -i "s/54000/56000/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/54100/56100/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py -sed -i "s/1234567/1234567,1231237,123123701/g" /opt/FDMR-Monitor/proxy/proxy.cfg +sed -i "s/db_username =.*/db_username = 'hbmon'/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/db_password =.*/db_password = 'hbmon'/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/db_name =.*/db_name = 'hbmon'/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/\/freedmr.cfg/\/config\/FreeDMR.cfg/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/db_selfcare =.*/db_selfcare = ProxyDB('localhost', 'hbmon', 'hbmon', 'hbmon', 3306)/g" /opt/FDMR-Monitor2/proxy/proxy_db.py +sed -i "s/USERNAME =.*/USERNAME = hbmon/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +sed -i "s/PASSWORD =.*/PASSWORD = hbmon/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +sed -i "s/DB_NAME =.*/DB_NAME = hbmon/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +sed -i "s/54000/56000/g" /opt/FDMR-Monitor2/proxy/proxy_db.py +sed -i "s/54000/56000/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +sed -i "s/54100/56099/g" /opt/FDMR-Monitor2/proxy/proxy_db.py +sed -i "s/54100/56099/g" /opt/FDMR-Monitor2/proxy/proxy.cfg +sed -i "s/54000/56000/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/54100/56099/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py +sed -i "s/1234567/1234567,1231237,123123701/g" /opt/FDMR-Monitor2/proxy/proxy.cfg ################# -cp /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py /opt/FreeDMR/hotspot_proxy_v2.py -cp /opt/FDMR-Monitor/proxy/proxy.cfg /opt/FreeDMR/proxy.cfg -cp /opt/FDMR-Monitor/proxy/proxy_db.py /opt/FreeDMR/proxy_db.py +cp /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py /opt/FreeDMR/hotspot_proxy_v2.py +cp /opt/FDMR-Monitor2/proxy/proxy.cfg /opt/FreeDMR/proxy.cfg +cp /opt/FDMR-Monitor2/proxy/proxy_db.py /opt/FreeDMR/proxy_db.py #################### sudo chmod +x /opt/FreeDMR/*.py sudo chmod +x /opt/FreeDMR/config/*.py