beenull/EHCP-Force-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove sites-enabled symlink since EHCP Force uses its own templates, and this file no longer is a symlink later, so it should not be a symlink right off the bat

Browse source
This commit is contained in:
earnolmartin 2023-10-23 14:31:19 -06:00
parent 2c14ac8062
commit 5cd25df190
2 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ehcp/ehcpforceupdate.sh
View file

@ -3468,6 +3468,26 @@ function createSymlinks(){
if [ ! -e "/var/www/new/phpmyadmin" ] && [ -e "/usr/share/phpmyadmin" ]; then
ln -s /usr/share/phpmyadmin "/var/www/new/phpmyadmin"
fi
# Remove some symlinks that can break things depending on certain situations
# Nginx
# Remove /etc/nginx/sites-enabled/default symlink if exists
if [ -L "/etc/nginx/sites-enabled/default" ]; then
rm -f "/etc/nginx/sites-enabled/default"
if [ -e "/etc/nginx/sites-available/default" ]; then
cp "/etc/nginx/sites-available/default" "/etc/nginx/sites-enabled/default"
fi
fi
#Apache2
# Remove /etc/apache2/sites-enabled/default symlink if exists
if [ -L "/etc/apache2/sites-enabled/default" ]; then
rm -f "/etc/apache2/sites-enabled/default"
if [ -e "/etc/apache2/sites-available/default" ]; then
cp "/etc/apache2/sites-available/default" "/etc/apache2/sites-enabled/default"
fi
fi
}
function preventUserCronFromWebUser(){

20
ehcp/install_main.sh
View file

@ -3131,6 +3131,26 @@ function createSymlinks(){
if [ ! -e "/var/www/new/phpmyadmin" ] && [ -e "/usr/share/phpmyadmin" ]; then
ln -s /usr/share/phpmyadmin "/var/www/new/phpmyadmin"
fi
# Remove some symlinks that can break things depending on certain situations
# Nginx
# Remove /etc/nginx/sites-enabled/default symlink if exists
if [ -L "/etc/nginx/sites-enabled/default" ]; then
rm -f "/etc/nginx/sites-enabled/default"
if [ -e "/etc/nginx/sites-available/default" ]; then
cp "/etc/nginx/sites-available/default" "/etc/nginx/sites-enabled/default"
fi
fi
#Apache2
# Remove /etc/apache2/sites-enabled/default symlink if exists
if [ -L "/etc/apache2/sites-enabled/default" ]; then
rm -f "/etc/apache2/sites-enabled/default"
if [ -e "/etc/apache2/sites-available/default" ]; then
cp "/etc/apache2/sites-available/default" "/etc/apache2/sites-enabled/default"
fi
fi
}
function preventUserCronFromWebUser(){