瀏覽代碼

Add mistakenly removed apache2 stop routine.

Raphael Schneeberger 5 年之前
父節點
當前提交
a4ad3a87a7
共有 2 個文件被更改,包括 7 次插入0 次删除
  1. 3 0
      install/hst-install-debian.sh
  2. 4 0
      install/hst-install-ubuntu.sh

+ 3 - 0
install/hst-install-debian.sh

@@ -1211,6 +1211,9 @@ if [ "$apache" = 'yes' ]; then
     update-rc.d apache2 defaults > /dev/null 2>&1
     update-rc.d apache2 defaults > /dev/null 2>&1
     systemctl start apache2 >> $LOG
     systemctl start apache2 >> $LOG
     check_result $? "apache2 start failed"
     check_result $? "apache2 start failed"
+else
+    update-rc.d apache2 disable > /dev/null 2>&1
+    systemctl stop apache2 > /dev/null 2>&1
 fi
 fi
 
 
 
 

+ 4 - 0
install/hst-install-ubuntu.sh

@@ -1118,6 +1118,7 @@ fi
 # Install dhparam.pem
 # Install dhparam.pem
 cp -f $HESTIA_INSTALL_DIR/ssl/dhparam.pem /etc/ssl
 cp -f $HESTIA_INSTALL_DIR/ssl/dhparam.pem /etc/ssl
 
 
+
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 #                     Configure Nginx                      #
 #                     Configure Nginx                      #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
@@ -1183,6 +1184,9 @@ if [ "$apache" = 'yes' ]; then
     update-rc.d apache2 defaults > /dev/null 2>&1
     update-rc.d apache2 defaults > /dev/null 2>&1
     systemctl start apache2 >> $LOG
     systemctl start apache2 >> $LOG
     check_result $? "apache2 start failed"
     check_result $? "apache2 start failed"
+else
+    update-rc.d apache2 disable > /dev/null 2>&1
+    systemctl stop apache2 > /dev/null 2>&1
 fi
 fi