From ce93a470b518be227f61fb9ce9fffc28fe190564 Mon Sep 17 00:00:00 2001 From: "Esteban Mackay Q." Date: Tue, 30 Apr 2024 12:54:37 -0500 Subject: [PATCH] adn --- install.sh | 22 +--------------------- update.sh | 51 --------------------------------------------------- 2 files changed, 1 insertion(+), 72 deletions(-) diff --git a/install.sh b/install.sh index 8844610..decc028 100644 --- a/install.sh +++ b/install.sh @@ -867,27 +867,7 @@ 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/56400/g" /opt/FDMR-Monitor2/proxy/proxy_db.py -sed -i "s/54000/56400/g" /opt/FDMR-Monitor2/proxy/proxy.cfg -sed -i "s/54100/56499/g" /opt/FDMR-Monitor2/proxy/proxy_db.py -sed -i "s/54100/56499/g" /opt/FDMR-Monitor2/proxy/proxy.cfg -sed -i "s/54000/56400/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py -sed -i "s/54100/56499/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py -sed -i "s/1234567/1234567,1231237,123123701/g" /opt/FDMR-Monitor2/proxy/proxy.cfg -#sed -i "s228/20/50/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.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 - +########################################################## 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 717dfa8..f6f12f8 100644 --- a/update.sh +++ b/update.sh @@ -664,7 +664,6 @@ variable5=$(grep "COLOR_2 =" /opt/FDMR-Monitor/fdmr-mon.cfg) sudo systemctl stop fdmr_mon2.service sudo systemctl stop fdmr_mon.service -sudo systemctl stop proxy.service ############################################################## # service update @@ -791,28 +790,7 @@ sed -i "s|SUBSCRIBER_URL.*|SUBSCRIBER_URL = https://adn.systems/files/subscriber sed -i "s|TGID_URL.*|TGID_URL = https://adn.systems/files/talkgroup_ids.json|g" /opt/FDMR-Monitor/fdmr-mon.cfg sed -i "s|PEER_URL.*|PEER_URL = https://adn.systems/files/peer_ids.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/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/56400/g" /opt/FDMR-Monitor2/proxy/proxy_db.py -sed -i "s/54000/56400/g" /opt/FDMR-Monitor2/proxy/proxy.cfg -sed -i "s/54100/56499/g" /opt/FDMR-Monitor2/proxy/proxy_db.py -sed -i "s/54100/56499/g" /opt/FDMR-Monitor2/proxy/proxy.cfg -sed -i "s/54000/56400/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py -sed -i "s/54100/56499/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py -sed -i "s/1234567/1234567,1231237,123123701/g" /opt/FDMR-Monitor2/proxy/proxy.cfg -#sed -i '228s/20/50/' /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.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 - #logo #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 && #favicon.ico @@ -1155,7 +1133,6 @@ fi systemctl daemon-reload && systemctl start fdmr_mon.service - systemctl start proxy.service sh /opt/extra-2.sh cronedit.sh '*/5 * * * *' 'sh /opt/FDMR-Monitor/sysinfo/graph.sh' add && @@ -1181,7 +1158,6 @@ fi cd / sudo systemctl stop fdmr_mon.service sudo systemctl stop fdmr_mon2.service -sudo systemctl stop proxy.service ############################################################## # service update @@ -1287,28 +1263,6 @@ sudo cp /opt/FDMR-Monitor2/html/* /var/www/fdmr2/ -r ############################### -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/56400/g" /opt/FDMR-Monitor2/proxy/proxy_db.py -sed -i "s/54000/56400/g" /opt/FDMR-Monitor2/proxy/proxy.cfg -sed -i "s/54100/56499/g" /opt/FDMR-Monitor2/proxy/proxy_db.py -sed -i "s/54100/56499/g" /opt/FDMR-Monitor2/proxy/proxy.cfg -sed -i "s/54000/56400/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py -sed -i "s/54100/56499/g" /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.py -sed -i "s/1234567/1234567,1231237,123123701/g" /opt/FDMR-Monitor2/proxy/proxy.cfg -#sed -i '228s/20/50/' /opt/FDMR-Monitor2/proxy/hotspot_proxy_v2.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 -#***** mv /opt/FDMR-Monitor2/utils/logrotate/fdmr_mon /opt/FDMR-Monitor2/utils/logrotate/fdmr_mon2 mv /opt/FDMR-Monitor2/utils/systemd/fdmr_mon.service /opt/FDMR-Monitor2/utils/systemd/fdmr_mon2.service # \ @@ -1378,10 +1332,6 @@ sudo systemctl disable fdmr_mon.service if ! systemctl status fdmr_mon2.service | grep "service; enabled;" >/dev/null 2>&1; then sudo systemctl enable fdmr_mon2.service fi -if ! systemctl status proxy.service | grep "service; enabled;" >/dev/null 2>&1; then - sudo systemctl enable proxy.service - -fi variable1=$(grep "Web-Dashboar-Port:" /opt/wdp | grep -Eo '[A.0-9]{1,9}') && if [ -z "$variable1" ] @@ -1389,7 +1339,6 @@ then variable1=80 fi systemctl start fdmr_mon2.service - systemctl start proxy.service sh /opt/extra-3.sh cronedit.sh '*/5 * * * *' 'sh /opt/FDMR-Monitor/sysinfo/graph.sh' remove &&