Put hestia-event apache config in conf.d folder during install,upgrade and migration script

Author: Lupul

install/hst-install-debian.sh

@@ -1199,15 +1199,13 @@ if [ "$apache" = 'yes' ]; then
     cp -f $HESTIA_INSTALL_DIR/apache2/apache2.conf /etc/apache2/
     cp -f $HESTIA_INSTALL_DIR/apache2/status.conf /etc/apache2/mods-available/hestia-status.conf
     cp -f /etc/apache2/mods-available/status.load /etc/apache2/mods-available/hestia-status.load
-    cp -f $HESTIA_INSTALL_DIR/apache2/hestia-event.conf /etc/apache2/conf-available/
     cp -f $HESTIA_INSTALL_DIR/logrotate/apache2 /etc/logrotate.d/
 
     # Enable needed modules
     a2enmod rewrite > /dev/null 2>&1
     a2enmod suexec > /dev/null 2>&1
     a2enmod ssl > /dev/null 2>&1
     a2enmod actions > /dev/null 2>&1
-    a2enconf --quiet hestia-event
     a2dismod --quiet status > /dev/null 2>&1
     a2enmod --quiet hestia-status
 
@@ -1216,6 +1214,7 @@ if [ "$apache" = 'yes' ]; then
         a2dismod php$fpm_v > /dev/null 2>&1
         a2dismod mpm_prefork > /dev/null 2>&1
         a2enmod mpm_event > /dev/null 2>&1
+        cp -f $HESTIA_INSTALL_DIR/apache2/hestia-event.conf /etc/apache2/conf.d/
     else
         if [ "$release" -eq 10 ]; then
             a2enmod mpm_itk > /dev/null 2>&1

install/hst-install-ubuntu.sh

@@ -1191,15 +1191,13 @@ if [ "$apache" = 'yes' ]; then
     cp -f $HESTIA_INSTALL_DIR/apache2/apache2.conf /etc/apache2/
     cp -f $HESTIA_INSTALL_DIR/apache2/status.conf /etc/apache2/mods-available/hestia-status.conf
     cp -f /etc/apache2/mods-available/status.load /etc/apache2/mods-available/hestia-status.load
-    cp -f $HESTIA_INSTALL_DIR/apache2/hestia-event.conf /etc/apache2/conf-available/
     cp -f $HESTIA_INSTALL_DIR/logrotate/apache2 /etc/logrotate.d/
 
     # Enable needed modules
     a2enmod rewrite > /dev/null 2>&1
     a2enmod suexec > /dev/null 2>&1
     a2enmod ssl > /dev/null 2>&1
     a2enmod actions > /dev/null 2>&1
-    a2enconf --quiet hestia-event
     a2dismod --quiet status > /dev/null 2>&1
     a2enmod --quiet hestia-status
 
@@ -1209,6 +1207,7 @@ if [ "$apache" = 'yes' ]; then
         a2dismod php$fpm_v > /dev/null 2>&1
         a2dismod mpm_prefork > /dev/null 2>&1
         a2enmod mpm_event > /dev/null 2>&1
+        cp -f $HESTIA_INSTALL_DIR/apache2/hestia-event.conf /etc/apache2/conf.d/
     else
         a2enmod ruid2 > /dev/null 2>&1
     fi

install/upgrade/manual/migrate_mpm_event.sh

@@ -34,13 +34,16 @@ for module in $a2modules; do
 done
 
 a2enmod --quiet mpm_event
+cp -f $HESTIA_INSTALL_DIR/apache2/hestia-event.conf /etc/apache2/conf.d/
 
 # Check if all went well
 if ! apache2ctl configtest >/dev/null 2>&1; then
     echo "Something went wrong, rolling back. Please try to migrate manually to mpm_event."
     for module in $changed_a2modules; do
         a2enmod "$module"
     done
+    rm --force /etc/apache2/conf.d/hestia-event.conf
+
     exit 1
 fi
 

install/upgrade/versions/latest.sh

@@ -120,7 +120,7 @@ if [ "$WEB_SYSTEM" = "apache2" ]; then
     rm --force /etc/apache2/conf-available/hestia-event.conf
     rm --force /etc/apache2/conf-enabled/hestia-event.conf
 
-    if [ ! -e "/etc/apache2/conf.d/hestia-event.conf" ]; then
+    if [ $(a2query -M) = 'event' ] && [ ! -e "/etc/apache2/conf.d/hestia-event.conf" ]; then
         cp -f $HESTIA_INSTALL_DIR/apache2/hestia-event.conf /etc/apache2/conf.d/
     fi