Work_Archive/VPS-scripts_Web-V2
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 11 Wiki Activity

Fixed oopsie

Browse Source
This commit is contained in:
Bram Prieshof
2020-12-09 15:29:02 +01:00
parent 95f2a19422
commit fe742ec534
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreModules/apache/conf.sh
View File

@@ -56,7 +56,7 @@ sed -i -e 's/DOMAINname/'$hostname'/g' "$apacheConfDir"/sites-available/Backend_
mkdir -p /opt/toggle 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 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

2
CoreModules/apache/preconf.sh
View File

@@ -1,7 +1,7 @@
if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then if [ "$shortdist" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
# Debian/Ubunbtu apache variables # Debian/Ubunbtu apache variables
apacheConfDir=/etc/apache2 apacheConfDir=/etc/apache2
apacheService=apche2 apacheService=apache2
elif [ "$shortdist" = "el8" ]; then elif [ "$shortdist" = "el8" ]; then
# Centos Php variable # Centos Php variable