From 02ba33403244ee8e1b48a357c1d1744ade17bd12 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 8 Jan 2021 12:47:46 +0100
Subject: [PATCH] updated config path in script

---
 conf.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/conf.sh b/conf.sh
index 1de2ef9..7e9461e 100644
--- a/conf.sh
+++ b/conf.sh
@@ -26,7 +26,7 @@ fi
 
 systemctl stop monit
 
-curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/monit/monitrc -o $monitconf
+curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/monit/monitrc -o $monitconf
 
 if [ ! -d "/var/lib/monit" ] ; then mkdir -p /var/lib/monit; fi
 mkdir -p /etc/monit/conf.d
@@ -35,29 +35,29 @@ mkdir -p /etc/monit/conf.d
 SysServiceList=$(systemctl list-units --full -all)
 
 #SystemMonitor
-curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/monit/system.conf -o /etc/monit/conf.d/system.conf  
+curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/monit/system.conf -o /etc/monit/conf.d/system.conf  
 
 #sshd
 if echo "$SysServiceList" | grep -Fq 'sshd'; then    
-  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/monit/sshd.conf -o /etc/monit/conf.d/sshd.conf  
+  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/monit/sshd.conf -o /etc/monit/conf.d/sshd.conf  
 fi
 
 #Fail2Ban
 if echo "$SysServiceList" | grep -Fq 'fail2ban'; then    
-  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/monit/fail2ban.conf -o /etc/monit/conf.d/fail2ban.conf  
+  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/monit/fail2ban.conf -o /etc/monit/conf.d/fail2ban.conf  
 fi
 
 if echo "$SysServiceList" | grep -Fq "$monitMysqlserv"; then    
-  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/monit/mysql.conf -o /etc/monit/conf.d/mysql.conf 
+  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/monit/mysql.conf -o /etc/monit/conf.d/mysql.conf 
   sed -i "s/MYSQLserv/$monitMysqlservice/g" /etc/monit/conf.d/mysql.conf
 fi
 
 if echo "$SysServiceList" | grep -Fq 'nginx'; then    
-  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/monit/nginx.conf -o /etc/monit/conf.d/nginx.conf
+  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/monit/nginx.conf -o /etc/monit/conf.d/nginx.conf
 fi
 
 if echo "$SysServiceList" | grep -Fq "$phpFPMService" && test ! -z "$phpFPMService"; then    
-  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/monit/php-fpm.conf -o /etc/monit/conf.d/php"$phpver".conf
+  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/monit/php-fpm.conf -o /etc/monit/conf.d/php"$phpver".conf
   sed -i "s/PHPpid/$monitPhpPid/g" /etc/monit/conf.d/php"$phpver".conf
   sed -i "s/PHPpro/$monitPhpPro/g" /etc/monit/conf.d/php"$phpver".conf
   sed -i "s/PHPsrv/$phpFPMService/g" /etc/monit/conf.d/php"$phpver".conf
@@ -65,7 +65,7 @@ if echo "$SysServiceList" | grep -Fq "$phpFPMService" && test ! -z "$phpFPMServi
 fi
 
 if echo "$SysServiceList" | grep -Fq "$apacheService" && test ! -z "$apacheService"; then    
-  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/monit/apache.conf -o /etc/monit/conf.d/apache.conf
+  curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/monit/apache.conf -o /etc/monit/conf.d/apache.conf
   sed -i "s/APAserv/$apacheService/g" /etc/monit/conf.d/apache.conf
   sed -i "s/APApro/$monitApachepro/g" /etc/monit/conf.d/apache.conf
 fi