From 1b8faca11a1522a23ec711f49b14a989a290067a Mon Sep 17 00:00:00 2001 From: Esteban Mackay Q Date: Mon, 11 Dec 2023 01:27:59 -0500 Subject: [PATCH] update --- fdmr-bridge.sh | 3 +-- install.sh | 27 +++++++++------------------ 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/fdmr-bridge.sh b/fdmr-bridge.sh index 751a272..c981f6c 100644 --- a/fdmr-bridge.sh +++ b/fdmr-bridge.sh @@ -1,4 +1,4 @@ - +#!/bin/bash cd /opt/ if [ -f "/opt/FreeDMR-Bridge/config/FreeDMR.cfg" ]; then @@ -428,7 +428,6 @@ systemctl disable apache2 ##################### chmod +x /opt/FDMR-Monitor-B/sysinfo/* sh /opt/FDMR-Monitor-B/sysinfo/rrd-db.sh - ################## #Service ########## diff --git a/install.sh b/install.sh index 879f565..52e5109 100644 --- a/install.sh +++ b/install.sh @@ -1,5 +1,4 @@ #!/bin/bash - # Verificar si el usuario tiene permisos de root if [[ $EUID -ne 0 ]]; then echo "Este script debe ejecutarse como usuario ROOT" @@ -7,7 +6,6 @@ if [[ $EUID -ne 0 ]]; then fi ####### cd / - ###################################################################################################################### # Cronedit ###################################################################################################################### @@ -178,10 +176,8 @@ EOF # fi sudo chmod +x /opt/extra-* - ######################### #lamp - apps=("mariadb-server" "php" "libapache2-mod-php" "php-zip" "php-mbstring" "php-cli" "php-common" "php-curl" "php-xml" "php-mysql") # Función para verificar e instalar una aplicación @@ -200,7 +196,6 @@ check_and_install() { for app in "${apps[@]}"; do check_and_install $app done - sudo systemctl restart mariadb && sudo systemctl enable mariadb #sudo mysql_secure_installation --host=localhost --port=3306 @@ -327,7 +322,7 @@ sed -i "s/SUBSCRIBER_URL:.*/SUBSCRIBER_URL: http:\/\/datafiles.ddns.net:8888\/us 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/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/ cat FreeDMR-SAMPLE.cfg conf.txt obp.txt >> /opt/FreeDMR/config/FreeDMR.cfg @@ -335,10 +330,10 @@ sed -i 's/file-timed/console-timed/' /opt/FreeDMR/config/FreeDMR.cfg sed -i 's/INFO/DEBUG/' /opt/FreeDMR/config/FreeDMR.cfg sed -i 's/freedmr.log/\/var\/log\/FreeDMR\/FreeDMR.log/' /opt/FreeDMR/config/FreeDMR.cfg sed -i "s/SERVER_ID:.*/SERVER_ID: $variable/g" /opt/FreeDMR/config/FreeDMR.cfg - +# rm /opt/conf.txt rm /opt/FreeDMR-SAMPLE.cfg - +# cd /opt/FreeDMR/ mv loro.cfg /opt/FreeDMR/playback.cfg sed -i 's/54915/49061/' /opt/FreeDMR/playback.cfg @@ -349,10 +344,10 @@ cd /opt sudo git clone https://github.com/yuvelq/FDMR-Monitor.git cd FDMR-Monitor sudo git checkout Self_Service - +# sudo chmod +x install.sh chmod 755 /opt/FDMR-Monitor/data - +# sed -i 's/RELOAD_TIME =.*/RELOAD_TIME = 1/' /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg sed -i 's/FREQUENCY =.*/FREQUENCY = 1/' /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg sudo chmod 644 /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg @@ -371,13 +366,13 @@ sed -i "s/HBMonv2/FDMR-Monitor/g" /opt/FDMR-Monitor/sysinfo/*.sh sudo chmod +x /opt/FDMR-Monitor/sysinfo/cpu.sh sudo chmod +x /opt/FDMR-Monitor/sysinfo/graph.sh sudo chmod +x /opt/FDMR-Monitor/sysinfo/rrd-db.sh - +# sed -i "s/DB_NAME =.*/DB_NAME = hbmon/g" /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg sed -i "s/DB_USERNAME =.*/DB_USERNAME = hbmon/g" /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg sed -i "s/DB_PASSWORD =.*/DB_PASSWORD = hbmon/g" /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg sed -i "s/PRIVATE_NETWORK = True/PRIVATE_NETWORK = False/g" /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg sed -i "s/FILES_PATH =.*/FILES_PATH = \/opt\/FDMR-Monitor\/data/g" /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg - +# cd /opt/FDMR-Monitor/ #sudo rm /opt/FDMR-Monitor/install.sh ################ @@ -405,12 +400,11 @@ 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 - +# 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" @@ -493,7 +487,6 @@ EOF cp -r /opt/FDMR-Monitor/html/* /var/www/fdmr/ sudo chown www-data:www-data /var/www/fdmr/ -R cp /opt/FDMR-Monitor/utils/logrotate/fdmr_mon /etc/logrotate.d/ - sudo cat > /opt/FDMR-Monitor/templates/main_table.html <<- "EOF"
@@ -692,12 +685,10 @@ sed '67 a $tc = "background-image: linear-gradient(to bottom, $cd1 0%, $cd2 sed -i "s/THEME_COLOR =.*/THEME_COLOR = pro/g" /opt/FDMR-Monitor/fdmr-mon.cfg #sed -i "s/TGID_URL =.*/TGID_URL = https:\/\/freedmr.cymru\/talkgroups\/talkgroup_ids_json.php/g" /opt/FDMR-Monitor/fdmr-mon.cfg - if [ -f "mon.db" ] then rm mon.db fi - cd /opt/FDMR-Monitor python3 mon_db.py --create python3 mon_db.py --update