Merge branch 'staging/1.4.7' into main

Author: jaapmarcus

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.4.7] - Service release 
+
+### Bugfixes
+
+- Fix #1984 phppgadmin not working on apache2 systems
+- Fix #1985 Restart service not working
+
+
 ## [1.4.6] - Service release 
 
 ### Features

README.md

@@ -2,7 +2,7 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.4.5 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
+**Latest stable release:** Version 1.4.7 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
 
 **Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
 **Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>

bin/v-restart-service

@@ -33,26 +33,19 @@ is_format_valid 'service' 'restart'
 #                       Action                             #
 #----------------------------------------------------------#
 
-if [ -d /usr/sbin/php*/fpm/ ]; then 
+# Multi-instance service restart request handling
+if [ "$service" = "php-fpm" ];then
+    service_list=''
     # Get installed php versions
     php_versions=$(ls /usr/sbin/php*fpm* | cut -d'/' -f4 | sed 's|php-fpm||')
-    
     # Substitute php-fpm service name formats
     for version in $php_versions; do
-        if [ "$service" = "php-fpm${version}" ]; then
-            service="php${version}-fpm"
-        fi
+        service_list="${service_list} php${version}-fpm"
     done
-    
-    # Multi-instance service restart request handling
-    if [ "$service" = "php-fpm" ];then
-        for version in $php_versions; do
-            service_list="${service_list} php${version}-fpm"
-        done
-    else
-        service_list="$service"
-    fi
-fi 
+else
+    service_list="$service"
+fi
+
 for service in $service_list; do
 
     if [ "$service" = "iptables" ]; then

install/deb/pga/phppgadmin.conf

@@ -15,6 +15,12 @@ allow from all
   php_flag track_vars On
   php_value include_path .
 </IfModule>
+<IfModule mpm_event_module> 
+ # Use www.conf instead 
+ <FilesMatch \.php$> 
+     SetHandler "proxy:fcgi://127.0.0.1:9000" 
+ </FilesMatch> 
+</IfModule> 
 <IfModule !mod_php5.c>
   <IfModule mod_actions.c>
     <IfModule mod_cgi.c>

install/hst-install-debian.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.6'
+HESTIA_INSTALL_VER='1.4.7'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

install/hst-install-ubuntu.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.6'
+HESTIA_INSTALL_VER='1.4.7'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

install/upgrade/versions/1.4.6.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Hestia Control Panel upgrade script for target version 1.4.5
+# Hestia Control Panel upgrade script for target version 1.4.6
 
 #######################################################################################
 #######                      Place additional commands below.                   #######

install/upgrade/versions/1.4.7.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version 1.4.5
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+
+if [ ! -z "$DB_PGA_ALIAS" ]; then 
+    $HESTIA/bin/v-change-sys-db-alias 'pga' $DB_PGA_ALIAS
+fi

src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.4.6
+Version: 1.4.7
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com