Browse Source

Add PHP install informations and do a reboot instead logout.

Raphael Schneeberger 6 years ago
parent
commit
a40e8f534f
2 changed files with 14 additions and 14 deletions
  1. 7 7
      install/hst-install-debian.sh
  2. 7 7
      install/hst-install-ubuntu.sh

+ 7 - 7
install/hst-install-debian.sh

@@ -1193,14 +1193,14 @@ if [ "$multiphp" = 'yes' ] ; then
     for v in "${multiphp_v[@]}"; do
         cp -r /etc/php/$v/ /root/hst_install_backups/php$v/
         rm -f /etc/php/$v/fpm/pool.d/*
-
-        $HESTIA/bin/v-add-web-php "$v"
+        echo "(*) Install PHP version $v..."
+        $HESTIA/bin/v-add-web-php "$v" > /dev/null 2>&1
     done
 fi
 
 if [ "$phpfpm" = 'yes' ]; then
     echo "(*) Configuring PHP-FPM..."
-    $HESTIA/bin/v-add-web-php "$fpm_v"
+    $HESTIA/bin/v-add-web-php "$fpm_v" > /dev/null 2>&1
     cp -f $HESTIA_INSTALL_DIR/php-fpm/www.conf /etc/php/$fpm_v/fpm/pool.d/www.conf
     update-rc.d php$fpm_v-fpm defaults > /dev/null 2>&1
     systemctl start php$fpm_v-fpm >> $LOG
@@ -1833,11 +1833,11 @@ $HESTIA/bin/v-add-user-notification admin 'Welcome!' 'For more information on ho
 echo "(!) IMPORTANT: You must logout or restart the server before continuing."
 echo ""
 if [ "$interactive" = 'yes' ]; then
-    echo -n " Do you want to logout now? [Y/N] "
-    read resetshell
+    echo -n " Do you want to reboot now? [Y/N] "
+    read reboot
 
-    if [ "$resetshell" = "Y" ] || [ "$resetshell" = "y" ]; then
-        exit
+    if [ "$reboot" = "Y" ] || [ "$reboot" = "y" ]; then
+        reboot
     fi
 fi
 

+ 7 - 7
install/hst-install-ubuntu.sh

@@ -1160,14 +1160,14 @@ if [ "$multiphp" = 'yes' ] ; then
     for v in "${multiphp_v[@]}"; do
         cp -r /etc/php/$v/ /root/hst_install_backups/php$v/
         rm -f /etc/php/$v/fpm/pool.d/*
-
-        $HESTIA/bin/v-add-web-php "$v"
+        echo "(*) Install PHP version $v..."
+        $HESTIA/bin/v-add-web-php "$v" > /dev/null 2>&1
     done
 fi
 
 if [ "$phpfpm" = 'yes' ]; then
     echo "(*) Configuring PHP-FPM..."
-    $HESTIA/bin/v-add-web-php "$fpm_v"
+    $HESTIA/bin/v-add-web-php "$fpm_v" > /dev/null 2>&1
     cp -f $HESTIA_INSTALL_DIR/php-fpm/www.conf /etc/php/$fpm_v/fpm/pool.d/www.conf
     update-rc.d php$fpm_v-fpm defaults > /dev/null 2>&1
     systemctl start php$fpm_v-fpm >> $LOG
@@ -1760,11 +1760,11 @@ $HESTIA/bin/v-add-user-notification admin 'Welcome!' 'For more information on ho
 echo "(!) IMPORTANT: You must logout or restart the server before continuing."
 echo ""
 if [ "$interactive" = 'yes' ]; then
-    echo -n " Do you want to logout now? [Y/N] "
-    read resetshell
+    echo -n " Do you want to reboot now? [Y/N] "
+    read reboot
 
-    if [ "$resetshell" = "Y" ] || [ "$resetshell" = "y" ]; then
-        exit
+    if [ "$reboot" = "Y" ] || [ "$reboot" = "y" ]; then
+        reboot
     fi
 fi