Merge branch 'staging/1.4.6' into main

Author: jaapmarcus

CHANGELOG.md

@@ -1,10 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## Development 
+## [1.4.6] - Service release 
 
 ### Features
 
+- Add support for custom install hooks #1757
+- Add template for CraftCMS #1973 @anvme
+- Upgrade Filegator to 7.6.0
+
 ### Bugfixes
 
 - Fix #1961 Renewal Apache2 only SSL certificate fails

bin/v-add-sys-pma-sso

@@ -76,6 +76,7 @@ apikey=$($BIN/v-generate-api-key);
 # copy config dir to /usr/share/phpmyadmin/
 cp -f $HESTIA_INSTALL_DIR/phpmyadmin/hestia-sso.php $PMA_INSTALL/hestia-sso.php
 chmod 640 $PMA_INSTALL/hestia-sso.php 
+chown root:www-data $PMA_INSTALL/hestia-sso.php 
 
 sed -i "s/%PHPMYADMIN_KEY%/$phpmyadminkey/g" $PMA_INSTALL/hestia-sso.php 
 sed -i "s/%API_KEY%/$apikey/g" $PMA_INSTALL/hestia-sso.php 

bin/v-change-web-domain-backend-tpl

@@ -88,7 +88,7 @@ if [ ! -z "$CUSTOM_DOCROOT" ]; then
 fi
 
 # Checking backend pool configuration
-if [ "$backend_type" = "$user" ]; then
+if [[ "$backend_type" = "$user" && $WEB_BACKEND_POOL = 'user' ]]; then
     conf=$USER_DATA/web.conf
     fields='$DOMAIN'
     nohead=1

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~alpha'
+HESTIA_INSTALL_VER='1.4.6'
 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~alpha'
+HESTIA_INSTALL_VER='1.4.6'
 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/upgrade.conf

@@ -60,4 +60,4 @@ rc_v="1.4.11"
 rl_v="1.16.0"
 
 # Set version of File manager to update during upgrade if not already installed
-fm_v="7.5.2"
+fm_v="7.6.0"

install/upgrade/versions/1.4.6.sh

@@ -6,6 +6,7 @@
 #######                      Place additional commands below.                   #######
 #######################################################################################
 
-if [ -z "$DB_PMA_ALIAS" ]; then 
+if [ ! -z "$DB_PMA_ALIAS" ]; then 
     $HESTIA/bin/v-change-sys-db-alias 'pma' $DB_PMA_ALIAS
+    rm -rf /usr/share/phpmyadmin/tmp/*
 fi

src/deb/hestia/control

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

src/deb/hestia/postinst

@@ -36,6 +36,11 @@ upgrade_init_backup
 # Initialize logging
 upgrade_init_logging
 
+# Check if preinstall hook exists
+if [ -e "/etc/hestiacp/hooks/pre_install.sh" ]; then
+/etc/hestiacp/hooks/pre_install.sh
+fi
+
 # Set up console display and welcome message
 upgrade_welcome_message_log >> $LOG
 upgrade_welcome_message
@@ -92,4 +97,8 @@ upgrade_send_notification_to_panel
 upgrade_send_notification_to_email
 upgrade_send_log_to_email
 
+if [ -e "/etc/hestiacp/hooks/post_install.sh" ]; then
+    /etc/hestiacp/hooks/post_install.sh
+fi
+
 exit 0

src/deb/hestia/preinst

@@ -18,4 +18,4 @@ HESTIA_V=$(dpkg -s hestia | grep -i version | awk '{ print $2 }')
 
 if [ ! "$HESTIA_V" = "$VERSION" ]; then
     sed -i "s/VERSION=.*/VERSION='$HESTIA_V'/g" /usr/local/hestia/conf/hestia.conf
-fi
+fi