Просмотр исходного кода

Merge pull request #1221 from hestiacp/feature/2020-09-use_php7.4_as_default

Feature/2020 09 use php7.4 as default
Raphael Schneeberger 5 лет назад
Родитель
Сommit
d1786845db
4 измененных файлов с 4 добавлено и 10 удалено
  1. 1 0
      CHANGELOG.md
  2. 1 8
      bin/v-add-sys-filemanager
  3. 1 1
      install/hst-install-debian.sh
  4. 1 1
      install/hst-install-ubuntu.sh

+ 1 - 0
CHANGELOG.md

@@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
 - Add support Proftpd TLS Support
 - Add support Proftpd TLS Support
 - Add the possibility to assign user "Administrators" rights on login. Replaces "root" login. Notifications are only send towards the "admin" account email
 - Add the possibility to assign user "Administrators" rights on login. Replaces "root" login. Notifications are only send towards the "admin" account email
 - Updated translations system with the use of Gettext. Modified / Updated all translated strings
 - Updated translations system with the use of Gettext. Modified / Updated all translated strings
+- Use php7.4 as default
 
 
 ## Bugfixes
 ## Bugfixes
 - Removed root login (root / root password )
 - Removed root login (root / root password )

+ 1 - 8
bin/v-add-sys-filemanager

@@ -52,13 +52,6 @@ if [ ! -f "$COMPOSER_BIN" ]; then
     fi
     fi
 fi
 fi
 
 
-# Ensure PHP 7.3 is installed before continuing
-if [ ! -f "/usr/bin/php7.3" ]; then
-    $BIN/v-add-user-notification admin 'File Manager installation failed!' '<b>Unable to proceed with installation of File Manager.</b><br><br>Package <b>php7.3-cli</b> is missing from your system. Please check your PHP installation and environment settings.'
-    echo "ERROR: PHP 7.3 not installed on your system, aborting."
-    exit 1
-fi
-
 # Perform verification if read-only mode is enabled
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
 check_hestia_demo_mode
 
 
@@ -81,7 +74,7 @@ cp --recursive --force ${HESTIA_INSTALL_DIR}/filemanager/filegator/* "${FM_INSTA
 
 
 chown $user: -R "${FM_INSTALL_DIR}"
 chown $user: -R "${FM_INSTALL_DIR}"
 
 
-COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php7.3 $COMPOSER_BIN --quiet --no-dev install
+COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php $COMPOSER_BIN --quiet --no-dev install
 
 
 # Check if installation was successful, if not abort script and throw error message notification and clean-up
 # Check if installation was successful, if not abort script and throw error message notification and clean-up
 if [ $? -ne 0 ]; then
 if [ $? -ne 0 ]; then

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

@@ -26,7 +26,7 @@ VERBOSE='no'
 HESTIA_INSTALL_VER='1.3.0~beta'
 HESTIA_INSTALL_VER='1.3.0~beta'
 pma_v='5.0.2'
 pma_v='5.0.2'
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4")
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4")
-fpm_v="7.3"
+fpm_v="7.4"
 mariadb_v="10.4"
 mariadb_v="10.4"
 
 
 if [ "$release" -eq 9 ]; then
 if [ "$release" -eq 9 ]; then

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

@@ -26,7 +26,7 @@ VERBOSE='no'
 HESTIA_INSTALL_VER='1.3.0~beta'
 HESTIA_INSTALL_VER='1.3.0~beta'
 pma_v='5.0.2'
 pma_v='5.0.2'
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4")
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4")
-fpm_v="7.3"
+fpm_v="7.4"
 mariadb_v="10.4"
 mariadb_v="10.4"
 
 
 # Defining software pack for all distros
 # Defining software pack for all distros