From d23172ab41dfbff78fb758e9ff5ae08d93d111fb Mon Sep 17 00:00:00 2001 From: earnolmartin Date: Mon, 23 Oct 2023 14:42:12 -0600 Subject: [PATCH] Default Symlink Handling Apache Change --- ehcp/ehcpforceupdate.sh | 8 ++++---- ehcp/install_main.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ehcp/ehcpforceupdate.sh b/ehcp/ehcpforceupdate.sh index 648fc76..0e33968 100755 --- a/ehcp/ehcpforceupdate.sh +++ b/ehcp/ehcpforceupdate.sh @@ -3482,10 +3482,10 @@ function createSymlinks(){ #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" + if [ -L "/etc/apache2/sites-enabled/000-default.conf" ]; then + rm -f "/etc/apache2/sites-enabled/000-default.conf" + if [ -e "/etc/apache2/sites-available/000-default.conf" ]; then + cp "/etc/apache2/sites-available/000-default.conf" "/etc/apache2/sites-enabled/default" fi fi } diff --git a/ehcp/install_main.sh b/ehcp/install_main.sh index 64e6617..3f4776d 100755 --- a/ehcp/install_main.sh +++ b/ehcp/install_main.sh @@ -3145,10 +3145,10 @@ function createSymlinks(){ #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" + if [ -L "/etc/apache2/sites-enabled/000-default.conf" ]; then + rm -f "/etc/apache2/sites-enabled/000-default.conf" + if [ -e "/etc/apache2/sites-available/000-default.conf" ]; then + cp "/etc/apache2/sites-available/000-default.conf" "/etc/apache2/sites-enabled/default" fi fi }