From 1b8a8dbcf8b5b2b7acf42fabd03d39a0413e962f Mon Sep 17 00:00:00 2001
From: RaspbianProyect by HP3ICC <setcom40@gmail.com>
Date: Sat, 29 Jul 2023 04:58:55 +0000
Subject: [PATCH] Update update.sh

---
 update.sh | 71 +++++++++++++++++++++++++------------------------------
 1 file changed, 32 insertions(+), 39 deletions(-)

diff --git a/update.sh b/update.sh
index 37afd7b..db35887 100644
--- a/update.sh
+++ b/update.sh
@@ -560,6 +560,22 @@ sudo sed -i "s/test/selfcare/g"  /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
 sudo sed -i "s/PRIVATE_NETWORK = True/PRIVATE_NETWORK = False/g"  /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
 sudo sed -i "s/FILES_PATH =.*/FILES_PATH = \/opt\/FDMR-Monitor\/data/g" /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
 
+cat > /lib/systemd/system/http.server-fdmr.service <<- "EOFH"
+[Unit]
+Description=PHP http.server.fdmr
+After=network.target
+
+[Service]
+#User=root
+#ExecStartPre=/bin/sleep 30
+# Modify for different other port
+ExecStart=php -S 0.0.0.0:80 -t /var/www/fdmr/
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+EOFH
+
 cd /opt/FDMR-Monitor/
 #sudo rm /opt/FDMR-Monitor/install.sh
 ################
@@ -1013,6 +1029,21 @@ if [ ! -d "/var/www/fdmr2" ]
 then
    mkdir -p /var/www/fdmr2
 fi
+cat > /lib/systemd/system/http.server-fdmr2.service <<- "EOFHI"
+[Unit]
+Description=PHP http.server.fdmr2
+After=network.target
+
+[Service]
+#User=root
+#ExecStartPre=/bin/sleep 30
+# Modify for different other port
+ExecStart=php -S 0.0.0.0:80 -t /var/www/fdmr2/
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+EOFI
 
 cd /opt
 sudo git clone https://github.com/CS8ABG/FDMR-Monitor.git /opt/FDMR-Monitor2
@@ -1072,23 +1103,7 @@ mysql -u "root" "selfcare" -e "DROP TABLE IF EXISTS tg_count;"
 python3 mon_db.py --create
 python3 mon_db.py --update
 
-cat > /lib/systemd/system/http.server-fdmr2.service <<- "EOF"
-[Unit]
-Description=PHP http.server.fdmr2
-After=network.target
-
-[Service]
-#User=root
-#ExecStartPre=/bin/sleep 30
-# Modify for different other port
-ExecStart=php -S 0.0.0.0:80 -t /var/www/fdmr2/
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-
-EOF
-
+sudo systemctl daemon-reload
 #####################################
 
 if systemctl status mariadb.service |grep inactive >/dev/null 2>&1
@@ -1168,28 +1183,6 @@ cronjob_editor "$1" "$2" "$3"
 EOFC1
 sudo chmod +x /usr/local/bin/cronedit.sh
 
-if [ -f "/lib/systemd/system/http.server-fdmr.service" ];
-then
-   echo ""
- #echo "found file"
-else
-cat > /lib/systemd/system/http.server-fdmr.service <<- "EOFH"
-[Unit]
-Description=PHP http.server.fdmr
-After=network.target
-
-[Service]
-#User=root
-#ExecStartPre=/bin/sleep 30
-# Modify for different other port
-ExecStart=php -S 0.0.0.0:80 -t /var/www/fdmr/
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-EOFH
-
-fi
 
 ##########################################  End Update Files   ##############################################################
 sudo systemctl daemon-reload