diff --git a/AppendCMS.sh b/AppendCMS.sh index aa0fcac..003a060 100644 --- a/AppendCMS.sh +++ b/AppendCMS.sh @@ -3,11 +3,13 @@ ##-----------------## if [ ! -f "/etc/ICTM/selopts.list" ] || [ ! -f "/etc/ICTM/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi -if [ ! -f "/etc/ICTM/phpvar.list" ] ; then echo 'Php var list missing,Please run /Scipts/GeneratePhplist from the repo ' && exit ; fi source /etc/ICTM/selopts.list source /etc/ICTM/mainvar.list -source /etc/ICTM/phpvar.list +if [ $webserv != nginx_nonphp ]; then + if [ ! -f "/etc/ICTM/phpvar.list" ] ; then echo 'Php var list missing,Please run /Scipts/GeneratePhplist from the repo ' && exit ; fi + source /etc/ICTM/phpvar.list +fi if [ -f "/etc/ICTM/apachevar.list" ] ; then source /etc/ICTM/apachevar.list; fi rm /tmp/pkg.list > $OUTPUT 2>&1 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list) diff --git a/AppendModule.sh b/AppendModule.sh index b4f44de..f06e4b3 100644 --- a/AppendModule.sh +++ b/AppendModule.sh @@ -3,7 +3,6 @@ ##-----------------## if [ ! -f "/etc/ICTM/selopts.list" ] || [ ! -f "/etc/ICTM/mainvar.list" ] ; then echo 'This system is not yet setup, please run the main installer first' && exit ; fi -if [ ! -f "/etc/ICTM/phpvar.list" ] ; then echo 'Php var list missing,Please run /Scipts/GeneratePhplist from the repo ' && exit ; fi ##-----------------## # Fetching Vars # @@ -11,7 +10,10 @@ if [ ! -f "/etc/ICTM/phpvar.list" ] ; then echo 'Php var list missing,Please run source /etc/ICTM/selopts.list source /etc/ICTM/mainvar.list -source /etc/ICTM/phpvar.list +if [ $webserv != nginx_nonphp ]; then + if [ ! -f "/etc/ICTM/phpvar.list" ] ; then echo 'Php var list missing,Please run /Scipts/GeneratePhplist from the repo ' && exit ; fi + source /etc/ICTM/phpvar.list +fi if [ -f "/etc/ICTM/apachevar.list" ] ; then source /etc/ICTM/apachevar.list; fi rm /tmp/pkg.list source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list) diff --git a/CMS/none/conf.sh b/CMS/none/conf.sh index 4a424cf..650461a 100644 --- a/CMS/none/conf.sh +++ b/CMS/none/conf.sh @@ -1,3 +1,9 @@ +#Creating webfolder +mkdir -p /var/www/"$domain"/html + +#Ceating content +echo "$webserv has been succsefully installed by the Wizard" > /var/www/$domain/html/index.html + #Do not generate php pool when php is not installed if [ $webserv != nginx_nonphp ]; then @@ -9,20 +15,12 @@ useradd -g "$sitename" "$sitename" systemctl reload $phpFPMService -#Creating webfolder -mkdir -p /var/www/"$domain"/html - -#Ceating content -echo "$webserv has been succsefully installed by the Wizard" > /var/www/$domain/html/index.html - #Setting Permsissions chown "$sitename":"$sitename" -R /var/www/"$domain"/html +fi if [ "$shortdist" = "el8" ]; then #Setting SeLiux perms for centos semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/$domain/html(/.*)?" > $OUTPUT 2>&1 restorecon -vr /var/www/ > $OUTPUT 2>&1 -fi - - fi \ No newline at end of file