From ebc215dd5f00431da093b74d217eb91f540fa28f Mon Sep 17 00:00:00 2001 From: Esteban Mackay Q <49044505+hp3icc@users.noreply.github.com> Date: Sat, 11 Feb 2023 12:34:11 -0500 Subject: [PATCH] Add files via upload --- README.md | 9 ++++----- fdmr-update.sh | 6 +++--- install.sh | 6 +++--- menu.sh | 2 +- selfservice-update.sh | 6 +++--- update.sh | 4 ++-- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 95c545c..74ace56 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Easy-FreeDMR-SERVER-Install -![alt text](https://gitlab.com/hp3icc/Easy-FreeDMR-SERVER-Install/-/raw/main/IMG_1942.jpg) +![alt text](https://raw.githubusercontent.com/hp3icc/Easy-FreeDMR-SERVER-Install/main/IMG_1942.jpg) is an excerpt from the emq-TE1ws proyect, focused on new and current sysops who want to install FreeDMR easily, quickly and up-to-date. @@ -29,17 +29,16 @@ need have curl and sudo installed into your ssh terminal copy and paste the following link : apt-get update -apt-get install curl sudo -y - -sh -c "$(curl -fsSL https://gitlab.com/hp3icc/Easy-FreeDMR-SERVER-Install/-/raw/main/install.sh)" + apt-get install curl sudo -y + sh -c "$(curl -fsSL https://github.com/hp3icc/Easy-FreeDMR-SERVER/raw/main/install.sh)" # # Menu - ![alt text](https://gitlab.com/hp3icc/Easy-FreeDMR-SERVER-Install/-/raw/main/IMG_1941.jpg) + ![alt text](https://raw.githubusercontent.com/hp3icc/Easy-FreeDMR-SERVER-Install/main/IMG_1941.jpg) At the end of the installation your freedmr server will be installed and working, a menu will be displayed that will make it easier for you to edit, restart or update your server and dashboard to future versions. diff --git a/fdmr-update.sh b/fdmr-update.sh index 85fd121..78cdf2d 100644 --- a/fdmr-update.sh +++ b/fdmr-update.sh @@ -6,7 +6,7 @@ sudo systemctl stop fdmrparrot.service rm -r /opt/FreeDMR cd /opt git clone https://gitlab.hacknix.net/hacknix/FreeDMR.git -#git clone https://gitlab.com/hp3icc/FreeDMR.git +#git clone https://github.com/hp3icc/FreeDMR.git cd FreeDMR mkdir config mkdir /var/log/FreeDMR @@ -169,8 +169,8 @@ sudo sed -i "s/root/emqte1/g" /opt/FreeDMR/proxy.cfg sudo sed -i "s/test/selfcare/g" /opt/FreeDMR/proxy.cfg #sudo sed -i "56,63d" /opt/FreeDMR/config/FreeDMR.cfg ### -sh -c "$(curl -fsSL https://gitlab.com/hp3icc/Easy-FreeDMR-SERVER-Install/-/raw/main/menu.sh)" -sh -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1ws/-/raw/main/self/data-id-update.sh)" +sh -c "$(curl -fsSL https://raw.githubusercontent.com/hp3icc/Easy-FreeDMR-SERVER-Install/main/menu.sh)" +sh -c "$(curl -fsSL https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/self/data-id-update.sh)" data-id sudo chmod +x /opt/FreeDMR/*.py sudo chmod +x /opt/FreeDMR/config/*.py diff --git a/install.sh b/install.sh index 9d8b71b..74091d9 100644 --- a/install.sh +++ b/install.sh @@ -133,7 +133,7 @@ sudo chmod +777 /var/log sudo chmod +777 /var/log/* # -sh -c "$(curl -fsSL https://gitlab.com/hp3icc/Easy-FreeDMR-SERVER-Install/-/raw/main/menu.sh)" +sh -c "$(curl -fsSL https://raw.githubusercontent.com/hp3icc/Easy-FreeDMR-SERVER-Install/main/menu.sh)" ######################## if [ -f "/opt/obp.txt" ] @@ -459,7 +459,7 @@ sed '63 a TGID_URL = https://freedmr.cymru/talkgroups/talkgroup_ids_json.php' -i sed '64 a #TGID_URL = https://freedmr.cymru/talkgroups/talkgroup_ids_flags_json.php' -i /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg cd /opt/FDMR-Monitor/ sudo rm /opt/FDMR-Monitor/install.sh -wget https://gitlab.com/hp3icc/emq-TE1ws/-/raw/main/self/install.sh +wget https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/self/install.sh sudo chmod +x /opt/FDMR-Monitor/install.sh sudo chmod +x /opt/FDMR-Monitor/*.py # @@ -618,7 +618,7 @@ rm /var/log/syslog* rm /var/log/*.log* (crontab -l; echo "* */1 * * * sync ; echo 3 > /proc/sys/vm/drop_caches >/dev/null 2>&1")|awk '!x[$0]++'|crontab - -sh -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1ws/-/raw/main/self/data-id-update.sh)" +sh -c "$(curl -fsSL https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/self/data-id-update.sh)" data-id ##### sudo update-rc.d dphys-swapfile remove diff --git a/menu.sh b/menu.sh index 783247d..56d3458 100644 --- a/menu.sh +++ b/menu.sh @@ -38,7 +38,7 @@ sudo systemctl stop proxy.service && sudo systemctl start proxy.service && sudo 8) sudo systemctl stop fdmr_mon.service && sudo rm /opt/FDMR-Monitor/sysinfo/*.rrd && sh /opt/FDMR-Monitor/sysinfo/rrd-db.sh && cronedit.sh '*/5 * * * *' 'sh /opt/FDMR-Monitor/sysinfo/graph.sh' add && cronedit.sh '*/2 * * * *' 'sh /opt/FDMR-Monitor/sysinfo/cpu.sh' add && sudo systemctl enable fdmr_mon.service && sudo systemctl restart http.server-fdmr.service && sudo systemctl enable http.server-fdmr.service && sudo systemctl start fdmr_mon.service;; 9) -sh -c "$(curl -fsSL https://gitlab.com/hp3icc/Easy-FreeDMR-SERVER-Install/raw/main/update.sh)"; +sh -c "$(curl -fsSL https://github.com/hp3icc/Easy-FreeDMR-SERVER-Install/raw/main/update.sh)"; esac done exit 0 diff --git a/selfservice-update.sh b/selfservice-update.sh index 203e784..f58a4e1 100644 --- a/selfservice-update.sh +++ b/selfservice-update.sh @@ -159,7 +159,7 @@ sed '64 a #TGID_URL = https://freedmr.cymru/talkgroups/talkgroup_ids_flags_json. sudo rm /opt/FDMR-Monitor/data/* cd /opt/FDMR-Monitor/ sudo rm /opt/FDMR-Monitor/install.sh -wget https://gitlab.com/hp3icc/emq-TE1ws/-/raw/main/self/install.sh +wget https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/self/install.sh chmod +x /opt/FDMR-Monitor/install.sh # sh /opt/FDMR-Monitor/install.sh @@ -182,8 +182,8 @@ sh /opt/FDMR-Monitor/sysinfo/rrd-db.sh #sed '35 a -->' -i /var/www/html/sysinfo.php cp -r /opt/FDMR-Monitor/sysinfo/ /var/fdmr/html/sysinfo/ -sh -c "$(curl -fsSL https://gitlab.com/hp3icc/Easy-FreeDMR-SERVER-Install/-/raw/main/menu.sh)" -sh -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1ws/-/raw/main/self/data-id-update.sh)" +sh -c "$(curl -fsSL https://raw.githubusercontent.com/hp3icc/Easy-FreeDMR-SERVER-Install/main/menu.sh)" +sh -c "$(curl -fsSL https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/self/data-id-update.sh)" data-id #sudo rm mon.db #sudo python3 mon_db.py diff --git a/update.sh b/update.sh index 9a03f1d..6d8d95a 100644 --- a/update.sh +++ b/update.sh @@ -57,7 +57,7 @@ sudo nano /opt/rules.txt ;; 3) sudo nano /opt/extra-1.sh && chmod +x /opt/extra* ;; 4) -sh -c "$(curl -fsSL https://gitlab.com/hp3icc/Easy-FreeDMR-SERVER-Install/-/raw/main/fdmr-update.sh)" ;; +sh -c "$(curl -fsSL https://raw.githubusercontent.com/hp3icc/Easy-FreeDMR-SERVER-Install/main/fdmr-update.sh)" ;; 5) break; esac @@ -87,7 +87,7 @@ case $choix in 1) sudo nano /opt/extra-2.sh && chmod +x /opt/extra* ;; 2) -sh -c "$(curl -fsSL https://gitlab.com/hp3icc/Easy-FreeDMR-SERVER-Install/-/raw/main/selfservice-update.sh)" ;; +sh -c "$(curl -fsSL https://raw.githubusercontent.com/hp3icc/Easy-FreeDMR-SERVER-Install/main/selfservice-update.sh)" ;; 3) break; esac