diff --git a/CMS/frontcontroller/conf.sh b/CMS/frontcontroller/conf.sh index b776752..e05a832 100644 --- a/CMS/frontcontroller/conf.sh +++ b/CMS/frontcontroller/conf.sh @@ -23,7 +23,7 @@ mkdir -p /var/www/"$domain"/public echo "$webserv has been succsefully installed by the Wizard
Ready for FontControler installation" > /var/www/$domain/public/index.html #Setup PHP Pool -curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/none/Fpm-Pool.conf-unconfigured -o "$phpPoolDir"/"$sitename".conf +curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/frontcontroller/Fpm-Pool.conf-unconfigured -o "$phpPoolDir"/"$sitename".conf sed -i -e 's/PHPver/'$phpver'/g' -e 's/SITEname/'$sitename'/g' -e 's/DOMAINname/'$domain'/' "$phpPoolDir"/$sitename.conf groupadd "$sitename" useradd -g "$sitename" "$sitename" diff --git a/CMS/frontcontroller/nginx-conf.sh b/CMS/frontcontroller/nginx-conf.sh index 9cbedd3..dbb5ee7 100644 --- a/CMS/frontcontroller/nginx-conf.sh +++ b/CMS/frontcontroller/nginx-conf.sh @@ -1,4 +1,4 @@ -curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/none/Nginx-unconfigured -o /tmp/nginx-siteconf +curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/frontcontroller/Nginx-unconfigured -o /tmp/nginx-siteconf sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/g' -e 's/SITEname/'$sitename'/g' /tmp/nginx-siteconf sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/"$sitename"_"$site_ext"