Fix PHP

bin/module/php/add.inc

@@ -16,13 +16,16 @@ hestia_module_php_add() {
         exit 1
     fi
 
-    if [ ! $param_ver ]; then
-        echo "You must specify --ver [php_version]"
+    # PHP version is first parameter
+    param_ver="$1"
+
+    if [ ! "$param_ver" ]; then
+        echo "You must specify PHP version"
         exit 1
     fi
 
     # Verify php version format
-    if [[ ! $param_ver =~ ^[0-9]\.[0-9]+ ]]; then
+    if [[ ! "$param_ver" =~ ^[0-9]\.[0-9]+ ]]; then
         echo "The PHP version format is invalid, it should look like [0-9].[0-9]."
         exit
     fi
@@ -31,7 +34,7 @@ hestia_module_php_add() {
     php_version=''
     for ver in $PHP_SUPPORTED_VERSIONS; do
         if [ "$param_ver" == "$ver" ]; then
-            php_version=$param_ver
+            php_version="$param_ver"
             break;
         fi
     done
@@ -62,10 +65,10 @@ hestia_module_php_add() {
     php_prefix=$(osal_multiphp_php_package_prefix $php_version)
 
     mph="$php_prefix-mbstring $php_prefix-bcmath $php_prefix-cli $php_prefix-curl
-     $php_prefix-fpm $php_prefix-gd $php_prefix-intl $php_prefix-mysql
-     $php_prefix-soap $php_prefix-xml $php_prefix-zip $php_prefix-mbstring
-     $php_prefix-json $php_prefix-bz2 $php_prefix-pspell $php_prefix-imagick $php_prefix-pgsql
-     $php_prefix-imap $php_prefix-ldap"
+        $php_prefix-fpm $php_prefix-gd $php_prefix-intl $php_prefix-mysql
+        $php_prefix-soap $php_prefix-xml $php_prefix-zip $php_prefix-mbstring
+        $php_prefix-json $php_prefix-bz2 $php_prefix-pspell $php_prefix-imagick $php_prefix-pgsql
+        $php_prefix-imap $php_prefix-ldap"
 
     # Check is version is 7.1 or below to add mcrypt
     if [[ `echo "$php_version 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then
@@ -86,13 +89,13 @@ hestia_module_php_add() {
     if [ "$WEB_SYSTEM" = "apache2" ] || [ "$WEB_SYSTEM" = "httpd" ]; then
         osal_apache_module_enable 'proxy_fcgi'
         osal_apache_module_enable 'setenvif'
-        $BIN/v-restart-web
     fi
 
-    # Configure fpm
+    # Configure FPM
     osal_service_enable $php_prefix-fpm > /dev/null 2>&1
     pool_d=$(osal_multiphp_fpm_pool_d $php_version)
-    if [ $pool_d ]; then
+    if [ "$pool_d" ]; then
+        mkdir -p $pool_d
         rm -f $pool_d/*
         cp -f $HESTIA_INSTALL_DIR/php-fpm/dummy.conf $pool_d/
         sed -i "s/9999/99$php_withoutdot/g" $pool_d/dummy.conf       # FIXME: this'll break with PHP 10.0
@@ -110,5 +113,5 @@ hestia_module_php_add() {
 
     log_history "installed php $php_version" '' 'admin'
 
-    exit 0
+    $BIN/v-restart-web
 }

bin/module/php/install.inc

@@ -12,6 +12,15 @@ hestia_module_php_install() {
 
     echo "Installing PHP (FPM) module..."
 
+    $BIN/hestia module php add --ver $PHP_DEFAULT_VERSION
+
+    pool_d=$(osal_multiphp_fpm_pool_d $PHP_DEFAULT_VERSION)
+    cp -f $HESTIA_INSTALL_DIR/php-fpm/www.conf $pool_d/www.conf
+
+    if [ "$OS_BASE" = 'debian' ]; then    
+        update-alternatives --set php /usr/bin/php$PHP_DEFAULT_VERSION > /dev/null 2>&1
+    fi
+
     osal_kv_write $HESTIA/conf/hestia.conf 'WEB_BACKEND' 'php-fpm'
     osal_kv_write $HESTIA_CONF_MODULES/php.conf 'installed' '1'
     osal_kv_write $HESTIA_CONF_MODULES/php.conf 'description' 'Hestia PHP (FPM) module'
@@ -19,10 +28,10 @@ hestia_module_php_install() {
     osal_kv_write $HESTIA_CONF_MODULES/php.conf 'variant' 'php-fpm'
     osal_kv_write $HESTIA_CONF_MODULES/php.conf 'version' '1'
     osal_kv_write $HESTIA_CONF_MODULES/php.conf 'service_name' ''
-
+    
     # Add default version
     echo "Adding default PHP version..."
-    $BIN/hestia module php add --ver $PHP_DEFAULT_VERSION
+    $BIN/hestia module php add $PHP_DEFAULT_VERSION
 
     exit 0
 }