Merge branch 'staging/1.4.8' into main

Author: jaapmarcus

CHANGELOG.md

@@ -1,19 +1,27 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [Development]
+## [1.4.8] - Service release 
 
 ### Features
 
-- Add support for automated testing HestiaCP code
+- Add support for automated testing for HestiaCP code with @drone
 - Add support for SMTP server for internal email #1988 @Myself5 / #1165
 
 ### Bugfixes
 
+- Updated jQuery and jQuery UI to the latest version due to a vulnerability in jQuery. @dependabot
 - Resolve issue with double ENFORCE_SUBDOMAIN_OWNERSHIP keys in hestia.conf
 - Resolve issue with create new user during install in some cases #2000
-- Fixed an issue with Quick Install apps named Test123
-- Fixed #1995 Postfix should not conflict when no mailservice is selected
+- Fixed an issue with Quick Install apps named Test123 (@PsychotherapistSam)
+- Fix an issue with dovecot 2.3 ssl config (#1432)
+- Load $HESTIA path during upgrade script (#1698)
+- Remove TLS 1.1 from Proftpd config (#950)
+- Don't remove postfix when Exim is not installed (#1995)
+- Fix a bug in no-php Nginx FPM template (##2007)
+- Update German translations
+- Fixed a few minor error in Mail DMS records (#2005)
+
 
 ## [1.4.7] - Service release 
 
@@ -44,7 +52,7 @@ All notable changes to this project will be documented in this file.
 
 ### Bugfixes
 
-- Revert #1943 and rework it to fix possible errors occuring on v-rebuild-cron-jobs.
+- Revert #1943 and rework it to fix possible errors occurring on v-rebuild-cron-jobs.
 - Fixed #1956 to prevent reset of defined webmail client.
 - Explicitly disable cron reports #1978
 
@@ -61,11 +69,11 @@ All notable changes to this project will be documented in this file.
 - Add template for when webmail is disabled allowing to generate SSL. 
 - Fixed PHP bug in /list/log/ 
 - Fixed issue with time in /list/services as it was showing as 50 minute1 instead of minutes
-- Add missing back buttons + fix behavoir of back buttons on login page. 
+- Add missing back buttons + fix behaviour of back buttons on login page. 
 - Set "default" when WEB_TEMPLATE and PROXY_TEMPLATE is missing in user.conf 
 - Add BACKEND_TEMPLATE to default package
 - Fixed possible error occur for v-rebuild-cron-jobs #1943 (thanks @clarkchentw)
-- Restrict access Filemanager when SSH is enabled for the user (@bet0x)
+- Restrict access file manager when SSH is enabled for the user (@bet0x)
 - Check for DNS domains when running v-change-sys-ip-nat (@clarkchentw)
 - Fixed logical error in installer (@clarkchentw)
 

README.md

@@ -2,13 +2,13 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.4.7 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
+**Latest stable release:** Version 1.4.8 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md) | [![Build Status](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp) <br>
 
 **Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
 **Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>
 **Forums:** [forum.hestiacp.com](https://forum.hestiacp.com/)<br>
 **Discord:** [Join the discussion](https://discord.gg/nXRUZch)<br />
-<br>
+<br><br>
 [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ST87LQH2CHGLA)
 <br>
 

bin/v-list-sys-services

@@ -239,7 +239,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'remote' ]; then
             fi
             if [ -f /usr/bin/mysql ]; then
                 mariadb_v=`mysql -V | awk 'NR==1{print $5}' | head -c 4`
-                if [ $mariadb_v = "10.5" ]; then
+                if [ $mariadb_v = "10.5" ] || [ $mariadb_v = "10.6" ]; then
                     service='mariadb'
                     proc_name='mariadbd'
                 fi

func/domain.sh

@@ -917,7 +917,7 @@ is_base_domain_owner(){
         if [ "$object" != "none" ]; then
             get_base_domain $object
             web=$(grep -F -H -h "DOMAIN='$basedomain'" $HESTIA/data/users/*/web.conf);
-            if [ $ENFORCE_SUBDOMAIN_OWNERSHIP = "yes" ]; then
+            if [ "$ENFORCE_SUBDOMAIN_OWNERSHIP" = "yes" ]; then
                 if [ ! -z "$web" ]; then
                     parse_object_kv_list "$web"
                     if [ -z "$ALLOW_USERS" ] ||  [ "$ALLOW_USERS" != "yes" ]; then

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.7~alpha'
+HESTIA_INSTALL_VER='1.4.8'
 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")
@@ -347,7 +347,7 @@ conflicts_pkg="exim4 mariadb-server apache2 nginx hestia postfix"
 
 # Drop postfix from the list if exim should not be installed
 if [ "$exim" = 'no' ]; then
-    conflicts_pkg=$(echo $conflicts_pkg | sed -i 's/postfix//g' | xargs)
+    conflicts_pkg=$(echo $conflicts_pkg | sed 's/postfix//g' | xargs)
 fi
 
 for pkg in $conflicts_pkg; do
@@ -1619,7 +1619,7 @@ if [ "$dovecot" = 'yes' ]; then
       echo "[ * ] Downgrade dovecot config to sync with 2.2 settings"	
       sed -i 's|#ssl_dh_parameters_length = 4096|ssl_dh_parameters_length = 4096|g' /etc/dovecot/conf.d/10-ssl.conf
       sed -i 's|ssl_dh = </etc/ssl/dhparam.pem|#ssl_dh = </etc/ssl/dhparam.pem|g' /etc/dovecot/conf.d/10-ssl.conf
-      sed -i 's|ssl_min_protocol=TLSv1.1|ssl_protocols = !SSLv3 !TLSv1|g' /etc/dovecot/conf.d/10-ssl.conf
+      sed -i 's|ssl_min_protocols = TLSv1.1|ssl_protocols = !SSLv3 !TLSv1|g' /etc/dovecot/conf.d/10-ssl.conf
     fi
 
     update-rc.d dovecot defaults

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.7~alpha'
+HESTIA_INSTALL_VER='1.4.8'
 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")
@@ -321,7 +321,7 @@ conflicts_pkg="exim4 mariadb-server apache2 nginx hestia postfix ufw"
 
 # Drop postfix from the list if exim should not be installed
 if [ "$exim" = 'no' ]; then
-    conflicts_pkg=$(echo $conflicts_pkg | sed -i 's/postfix//g' | xargs)
+    conflicts_pkg=$(echo $conflicts_pkg | sed 's/postfix//g' | xargs)
 fi
 
 for pkg in $conflicts_pkg; do
@@ -1658,7 +1658,7 @@ if [ "$dovecot" = 'yes' ]; then
       echo "[ * ] Downgrade dovecot config to sync with 2.2 settings"	
       sed -i 's|#ssl_dh_parameters_length = 4096|ssl_dh_parameters_length = 4096|g' /etc/dovecot/conf.d/10-ssl.conf
       sed -i 's|ssl_dh = </etc/ssl/dhparam.pem|#ssl_dh = </etc/ssl/dhparam.pem|g' /etc/dovecot/conf.d/10-ssl.conf
-      sed -i 's|ssl_min_protocol=TLSv1.1|ssl_protocols = !SSLv3 !TLSv1|g' /etc/dovecot/conf.d/10-ssl.conf
+      sed -i 's|ssl_min_protocols = TLSv1.1|ssl_protocols = !SSLv3 !TLSv1|g' /etc/dovecot/conf.d/10-ssl.conf
     fi
 
     update-rc.d dovecot defaults

install/upgrade/versions/1.4.8.sh

@@ -17,10 +17,12 @@ if [ "$matches" > 1 ]; then
 	$HESTIA/bin/v-change-sys-config-value "ENFORCE_SUBDOMAIN_OWNERSHIP" "$ENFORCE_SUBDOMAIN_OWNERSHIP"
 fi
 
-version=$(dovecot --version |  cut -f -2 -d .);
-if [ "$version" = "2.3" ]; then 
-	echo "[ * ] Update dovecot config to sync with 2.3 settings"	
-	sed -i 's|ssl_dh_parameters_length = 4096|#ssl_dh_parameters_length = 4096|g' /etc/dovecot/conf.d/10-ssl.conf
-	sed -i 's|#ssl_dh = </etc/ssl/dhparam.pem|ssl_dh = </etc/ssl/dhparam.pem|g' /etc/dovecot/conf.d/10-ssl.conf
-	sed -i 's|ssl_protocols = !SSLv3 !TLSv1|ssl_min_protocol=TLSv1.1|g' /etc/dovecot/conf.d/10-ssl.conf
+if [ "$IMAP_SYSTEM" = "dovecot" ]; then 
+	version=$(dovecot --version |  cut -f -2 -d .);
+	if [ "$version" = "2.3" ]; then 
+		echo "[ * ] Update dovecot config to sync with 2.3 settings"	
+		sed -i 's|ssl_dh_parameters_length = 4096|#ssl_dh_parameters_length = 4096|g' /etc/dovecot/conf.d/10-ssl.conf
+		sed -i 's|#ssl_dh = </etc/ssl/dhparam.pem|ssl_dh = </etc/ssl/dhparam.pem|g' /etc/dovecot/conf.d/10-ssl.conf
+		sed -i 's|ssl_protocols = !SSLv3 !TLSv1|ssl_min_protocol=TLSv1.1|g' /etc/dovecot/conf.d/10-ssl.conf
+	fi
 fi

src/deb/hestia/control

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