Merge branch 'staging/1.4.5' into main

Author: jaapmarcus

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.4.5] - Service release
+
+### Bugfixes
+
+- Revert #1943 and rework it to fix possible errors occuring on v-rebuild-cron-jobs.
+- Fixed #1956 to prevent reset of defined webmail client.
+
 ## [1.4.4] - Service release
 
 ### Features

README.md

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

func/main.sh

@@ -610,11 +610,20 @@ sync_cron_jobs() {
     else
         crontab="/var/spool/cron/$user"
     fi
-    >$crontab
+    
+    # remove file if exists
+    if [ -e "$crontab" ]; then
+        rm -f $crontab
+    fi
+
+    # touch new crontab file
+    touch $crontab
+        
     if [ "$CRON_REPORTS" = 'yes' ]; then
         echo "MAILTO=$CONTACT" > $crontab
         echo 'CONTENT_TYPE="text/plain; charset=utf-8"' >> $crontab
     fi
+    
     while read line; do
         parse_object_kv_list "$line"
         if [ "$SUSPENDED" = 'no' ]; then

func/rebuild.sh

@@ -590,7 +590,7 @@ rebuild_mail_domain_conf() {
         fi
 
         # Webamil client
-        if [ "$WEBAMIL" = '' ]; then
+        if [ "$WEBMAIL" = '' ]; then
            $HESTIA/bin/v-add-mail-domain-webmail $user $domain 'roundcube' 'no'
         fi
 

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.4'
+HESTIA_INSTALL_VER='1.4.5'
 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.4'
+HESTIA_INSTALL_VER='1.4.5'
 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.5.sh

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

src/deb/hestia/control

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