diff --git a/CoreModules/apache/conf.sh b/CoreModules/apache/conf.sh index 33dea76..cdd2aa7 100644 --- a/CoreModules/apache/conf.sh +++ b/CoreModules/apache/conf.sh @@ -56,7 +56,7 @@ sed -i -e 's/DOMAINname/'$hostname'/g' "$apacheConfDir"/sites-available/Backend_ mkdir -p /opt/toggle curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_APACHE.sh -o /opt/toggle/toggle-PhpMyAdmin.sh -sed -i -e 's/APASRV/'$apacheService'/' -e 's/APADIR/'$apacheConfDir'/' /opt/toggle/toggle-PhpMyAdmin.sh +sed -i -e 's/APASRV/'$apacheService'/' -e 's#APADIR#'$apacheConfDir'#' /opt/toggle/toggle-PhpMyAdmin.sh diff --git a/CoreModules/apache/preconf.sh b/CoreModules/apache/preconf.sh index fac1fcf..f6641db 100644 --- a/CoreModules/apache/preconf.sh +++ b/CoreModules/apache/preconf.sh @@ -1,7 +1,7 @@ if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then # Debian/Ubunbtu apache variables apacheConfDir=/etc/apache2 - apacheService=apche2 + apacheService=apache2 elif [ "$shortdist" = "el8" ]; then # Centos Php variable