Prepare for 1.6.0 release

jaapmarcus · jaapmarcus · commit ad1178dc9051 · 2022-06-16T14:25:50.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,13 +3,19 @@ All notable changes to this project will be documented in this file.
 
 ## [1.6.0] - Major Release (Feature / Quality Update)
 
-### Breaking changes
+### Important Notes
+
+- Added support for Ubuntu 22.04 Jammy. If you planning to upgrade your server from Ubuntu 20.04 or 18.04 to Ubuntu 22.04 read the instruction carefully!
+- Issues with Ubuntu and Netplan and additional ip addresses has been discovered if this is the case for your setup please check if Netplan configuration is correct.
+- Due to know security issues with Rainloop [CVE-2022-29360](https://blog.sonarsource.com/rainloop-emails-at-risk-due-to-code-flaw/) and the lack of updates from there side we are planning to update / replace Rainloop with [Snappymail](https://github.com/the-djmaze/snappymail). How ever minor changes are needed to the release of Snappymail. The required changes have been made however we are waiting for for the final release of 2.16.4
+- Added support for Yescrypt and ARGON2ID for storing passwords of the users / email accounts password. If you encounter any issues (after importing a backup) with logging change the user / email account password and it will solve any issues. 
+
+### Deprecated
+
 - Dropped support for Debian 9 for new installs (#2537)
-- Dropped support for RSSH for Debian 9 and Ubuntu 18.04 on install (#2537)
+- Dropped support for RSSH on Ubuntu 18.04 on install (#2537)
 - Dropped support for TLS1.1 and older for Dovecot (#2012 and #2538)
-- Added support for Yescrypt  (#2235 / #2499) Breaking possible restores from Debian 11 / Ubuntu 22.04 to older Operating version (Change user password to solve the issue)
-- Added support for ARGON2ID for mail accounts (#2421)  Breaking possible restores form Debian 10 and 11, Ubuntu 20.04 and 22.04 to Ubuntu 18.04 / Debian 9
-
+ 
 ### Features
 
 - Added support for Ubuntu 22.04 Jammy (#2537 #2489)
@@ -22,6 +28,7 @@ All notable changes to this project will be documented in this file.
 - Introduce new api allowing users to use certain commands over API (#2535 and #1333)
 - Allow "Purge" cache button visible on templates with the name cacheing-your-template-name (#2526 #2530)
 - Add hooks to hestia-nginx and hestia-php (#2440)
+- Update DNS cluster to support new API system (#2587)
 
 ### Bugfixes
 
@@ -43,16 +50,39 @@ All notable changes to this project will be documented in this file.
 - Remove duplicate code in Ubuntu installer (#2542 @clarkchentw)
 - Fixed an issue in Nginx + Apache2 mail "disabled" template. Causing users unable to request an valid ssl certificate (#2550 #2549)
 - Fixed an issue with "Reject spam" option not working (#2551 #2545)
-- Fixed an issue with Editing / Adding DNS records (#2546, #2547, #2548 @DuoCZ) 
+- Fixed an issue with Editing / Adding DNS records (#2546, #2547, #2548 @DunoCZ) 
+- Fixed an issue with TXT records longer then 255 characters (#2559)
+- Fixed an issue with wp-cli permission denied and allow wp-cli to be run in v-run-cmd command (#2562 and #2565)
+- Fixed an issue with apt-get install output not written to install log (#2585)
+- Fixed multiple issues with improved Quick installer app for Wordpress (#2583)
+- Changes in upstream package caused phpMyAdmin Single Sign on feature to break (#2591)
+- Fixed issues with DNS cluster and the new API (#2587)
+- Fixed an issue where PHPpgAdmin config files was not renamed to .inc for Apache2 setups (#2592)
+- Startup Fail2ban on boot for Ubuntu 22.04 (#2596 #2594)
+- Fixed issue with duplicate config value (#2640 @Kujoe and #2605 #2610 )
+- Fixed an issue with change password function for webmail clients
+- Fixed multiple issues with Quick install apps in general (#2444, #1092, #2638)
+- Fixed an issue with memory usage graph and non english locale (#2643 #2540)
+- Fixed an issue with incorrect download path ftp backup (#2636 @cloudyhostcom)
+- Add php8.1 in v-run-cli-cmd (#2630 @gOOvER)
+- Fixed multiple issues with wildcard and Letsencrypt (#2627, #2626, #2624, #2623)
+- Fixed multiple issues in v-change-domain-owner (#2618, #2617, #1864)
+- Fixed an issue with MariadDB 10.8 detection (#2616)
+- Fixed an issue with netplan and additional ip addresses (#2612)
+- Removed MariaDB repo form Ubuntu 22.04 install 
+- Don not install Roundcube dependencies if Roundcube is missing while installing sieve.
+- Remove duplicated code in v-add-web-domain-ssl
 
 ### Dependencies
-- Update hestia-nginx to 1.21.6
-    - Update openssl to 3.0.3
+- Update hestia-nginx to 1.22.0
+    - Update OpenSSL to 3.0.3
     - Update zlib to 1.2.12
-    - Update PCRE2 to 10.40
-- Update hestia-php to 8.1.6
-- Update phpMyAdmin to 5.2.0 (https://www.phpmyadmin.net/files/5.2.0/)
-- Update Filegator to 7.8.1 (https://github.com/filegator/filegator/releases/tag/v7.8.1)
+    - Update PCRE to 10.40 
+- Update hestia-php to 8.1.7
+- Updated phpMyAdmin to 5.2.0 (https://www.phpmyadmin.net/files/5.2.0/)
+- Update Filegator to 7.8.1
+- Update PHPmailer to 6.6.2
+- Update composer dependencies
 
 ## [1.5.15] - Service release
 
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.5.15 | [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>
+**Latest stable release:** Version 1.6.0 | [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>
@@ -34,13 +34,13 @@ Supported platforms and operating systems
 
 AMD (x86_64 Intel/AMD)
 ----------------------------
-* **Debian:** 11, 10 or 9
-* **Ubuntu:** 20.04 LTS or 18.04 LTS
+* **Debian:** 11 or 10
+* **Ubuntu:** 22.04LTS, 20.04 LTS or 18.04 LTS
 
 ARM64 (arm64)
 ----------------------------
-* **Debian:** 11, 10 or 9
-* **Ubuntu:** 20.04 LTS or 18.04 LTS
+* **Debian:** 11 or 10
+* **Ubuntu:** 22.04LTS, 20.04 LTS or 18.04 LTS
 
 Installing Hestia Control Panel
 ============================
diff --git a/bin/v-add-access-key b/bin/v-add-access-key
@@ -31,7 +31,7 @@ keygen() {
 
     local MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
     if [[ "$USE_SPECIAL_CHARACTERS" == "yes" ]]; then
-        MATRIX+='_-^~='
+        MATRIX+='_-='
     fi
 
     local PASS N
diff --git a/bin/v-restart-dns b/bin/v-restart-dns
@@ -55,7 +55,7 @@ if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
 fi
 
 # Restart system
-$BIN/v-restart-service "$DNS_SYSTEM" > /dev/null 2>&1
+$BIN/v-restart-service "$DNS_SYSTEM" "$1" > /dev/null 2>&1
 if [ $? -ne 0 ]; then
     send_email_report
     check_result "$E_RESTART" "$DNS_SYSTEM restart failed"
diff --git a/bin/v-restart-ftp b/bin/v-restart-ftp
@@ -50,7 +50,7 @@ if [ "$1" = 'scheduled' ] || [ -z "$1" ]  && [ "$SCHEDULED_RESTART" = 'yes' ]; t
 fi
 
 # Restart system
-$BIN/v-restart-service "$FTP_SYSTEM" > /dev/null 2>&1
+$BIN/v-restart-service "$FTP_SYSTEM" "$1" > /dev/null 2>&1
 if [ $? -ne 0 ]; then
     send_email_report
     check_result "$E_RESTART" "$FTP_SYSTEM restart failed"
diff --git a/bin/v-restart-mail b/bin/v-restart-mail
@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: restart mail service
-# options: NONE
+# options: [RESTART]
 #
 # example: v-restart-mail
 #
@@ -51,15 +51,15 @@ fi
 tmpfile=$(mktemp)
 # Restart IMAP system if present
 if [ -n "$IMAP_SYSTEM" ]; then
-    $BIN/v-restart-service "$IMAP_SYSTEM" >> $tmpfile 2>&1
+    $BIN/v-restart-service "$IMAP_SYSTEM" "$1" >> $tmpfile 2>&1
     if [ $? -ne 0 ]; then
         send_email_report "$IMAP_SYSTEM"
         check_result "$E_RESTART" "$IMAP_SYSTEM restart failed"
     fi
 fi
 
 # Restart mail system
-$BIN/v-restart-service "$MAIL_SYSTEM" >> $tmpfile 2>&1
+$BIN/v-restart-service "$MAIL_SYSTEM" "$1" >> $tmpfile 2>&1
 if [ $? -ne 0 ]; then
     send_email_report "$MAIL_SYSTEM"
     check_result "$E_RESTART" "$MAIL_SYSTEM restart failed"
diff --git a/bin/v-restart-proxy b/bin/v-restart-proxy
@@ -2,7 +2,7 @@
 # info: restart proxy server
 # options: NONE
 #
-# example: v-restart-proxy
+# example: v-restart-proxy [RESTART]
 #
 # This function reloads proxy server configuration.
 
diff --git a/bin/v-restart-web b/bin/v-restart-web
@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: restart web server
-# options: NONE
+# options: [RESTARRT]
 #
 # example: v-restart-web
 #
@@ -46,6 +46,7 @@ if [ "$1" = "no" ]; then
     exit
 fi
 
+restart=$1
 # Schedule restart
 if [ "$1" = 'scheduled' ] || [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
     sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
@@ -76,7 +77,7 @@ elif [ $WEB_SYSTEM = 'apache2' ]; then
     fi
 fi
 
-$BIN/v-restart-service "$WEB_SYSTEM" "$restart" > /dev/null 2>&1
+$BIN/v-restart-service "$WEB_SYSTEM" "$restart" 
 
 if [ $? -ne 0 ]; then
     send_email_report
diff --git a/bin/v-restart-web-backend b/bin/v-restart-web-backend
@@ -55,7 +55,7 @@ for version in $($BIN/v-list-sys-php plain); do
         sed -i "s/9999/99${version//.}/g" "/etc/php/${version}/fpm/pool.d/dummy.conf"
     fi
 
-    $BIN/v-restart-service "$v_php" >> $tmpfile 2>&1
+    $BIN/v-restart-service "$v_php" "$1" >> $tmpfile 2>&1
     if [ $? -ne 0 ]; then
         send_email_report
         check_result "$E_RESTART" "$v_php restart failed"
diff --git a/func/syshealth.sh b/func/syshealth.sh
@@ -353,11 +353,6 @@ function syshealth_repair_system_config() {
         fi
     fi
 
-    # Enforce subdomain ownership
-    if [[ -z $(check_key_exists 'ENFORCE_SUBDOMAIN_OWNERSHIP') ]]; then
-        echo "[ ! ] Adding missing variable to hestia.conf: ENFORCE_SUBDOMAIN_OWNERSHIP ('yes')"
-        $BIN/v-change-sys-config-value "ENFORCE_SUBDOMAIN_OWNERSHIP" "yes"
-    fi
     # Debug mode
     if [[ -z $(check_key_exists 'DEBUG_MODE') ]]; then
         echo "[ ! ] Adding missing variable to hestia.conf: DEBUG_MODE ('false')"
diff --git a/install/deb/api/sync-dns-cluster b/install/deb/api/sync-dns-cluster
@@ -1,2 +1,2 @@
 ROLE='admin'
-COMMANDS='v-list-sys-config,v-list-user,v-add-cron-restart-job,v-delete-dns-domains-src,v-insert-dns-domain,v-insert-dns-record,v-insert-dns-records,v-rebuild-dns-domains,v-delete-dns-record,v-make-tmp-file,v-insert-dns-domain'
+COMMANDS='v-list-users,v-list-sys-config,v-list-user,v-add-cron-restart-job,v-delete-dns-domains-src,v-insert-dns-domain,v-insert-dns-record,v-insert-dns-records,v-rebuild-dns-domains,v-delete-dns-record,v-make-tmp-file,v-insert-dns-domain'
diff --git a/install/hst-install-debian.sh b/install/hst-install-debian.sh
@@ -6,7 +6,7 @@
 # https://www.hestiacp.com/
 #
 # Currently Supported Versions:
-# Debian 9, 10, 11
+# Debian 10, 11
 #
 # ======================================================== #
 
@@ -31,7 +31,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.6.0~beta-1'
+HESTIA_INSTALL_VER='1.6.0'
 # Dependencies
 pma_v='5.2.0'
 rc_v="1.6.0"
diff --git a/install/hst-install-ubuntu.sh b/install/hst-install-ubuntu.sh
@@ -31,7 +31,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.6.0~beta-1'
+HESTIA_INSTALL_VER='1.6.0'
 # Dependencies
 pma_v='5.2.0'
 rc_v="1.5.2"
@@ -1705,7 +1705,7 @@ if [ "$exim" = 'yes' ]; then
     gpasswd -a Debian-exim mail > /dev/null 2>&1
     if [ "$release" = "22.04" ]; then
       # Jammyy uses Exim 4.95 instead but config works with Exim4.94
-      cp -f $HESTIA_INSTALL_DIR/exim/exim4.conf.4.94.template /etc/exim4/
+      cp -f $HESTIA_INSTALL_DIR/exim/exim4.conf.4.94.template /etc/exim4/exim4.conf.template 
     else
       cp -f $HESTIA_INSTALL_DIR/exim/exim4.conf.template /etc/exim4/
     fi
diff --git a/install/upgrade/upgrade.conf b/install/upgrade/upgrade.conf
@@ -53,7 +53,7 @@ UPGRADE_UPDATE_FILEMANAGER_CONFIG='false'
 fm_v='7.8.1'
 
 # Set version of PHPMailer to update during upgrade if not already installed
-pm_v='6.6.0'
+pm_v='6.6.2'
 
 # Backblaze
 b2_v='3.2.0'
diff --git a/install/upgrade/versions/1.6.0.sh b/install/upgrade/versions/1.6.0.sh
@@ -21,6 +21,9 @@ upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'yes'
 upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'true'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
 
+# Delete compsoser to force update to composer v2
+rm -fr /home/admin/.composer
+
 if [ "$MAIL_SYSTEM" = "exim4" ]; then 
     echo "[ * ] Update exim4 config to support rate limits"
     # Upgrade config exim for custom limits
@@ -89,6 +92,22 @@ if [ -n "$PHPMYADMIN_KEY" ]; then
     $BIN/v-add-sys-pma-sso quiet
 fi
 
+#Fixed an issue with Exim4 and Ubutnu22.04 in beta version
+release=$(lsb_release -sr)
+if [ "$release" = "22.04" ]; then 
+    if [ -d "/etc/exim4/" ]; then
+        rm -fr /etc/exim4/exim.conf.template
+        cp -f $HESTIA_INSTALL_DIR/exim/exim4.conf.4.94.template /etc/exim4/exim4.conf.template 
+        if [ "$ANTIVIRUS_SYSTEM" = 'clamav-daemon' ]; then
+            sed -i "s/#SPAM/SPAM/g" /etc/exim4/exim4.conf.template
+        fi
+        if [ "$ANTISPAM_SYSTEM" = 'spamassassin' ]; then
+            sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template
+        fi
+
+    fi
+fi
+
 # Mute output v-add-sys-sftp-jail out put then enabling sftp on boot
 if [ -f "/etc/cron.d/hestia-sftp" ]; then
     rm /etc/cron.d/hestia-sftp
diff --git a/src/deb/hestia/control b/src/deb/hestia/control
@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.6.0~beta-1
+Version: 1.6.0
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com
diff --git a/src/deb/nginx/control b/src/deb/nginx/control
@@ -1,7 +1,7 @@
 Source: hestia-nginx
 Package: hestia-nginx
 Priority: optional
-Version: 1.21.6
+Version: 1.22.0
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com
diff --git a/src/deb/php/control b/src/deb/php/control
@@ -1,7 +1,7 @@
 Source: hestia-php
 Package: hestia-php
 Priority: optional
-Version: 8.1.6
+Version: 8.1.7
 Section: admin
 Maintainer: HestaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com
diff --git a/src/hst_autocompile.sh b/src/hst_autocompile.sh
@@ -298,9 +298,11 @@ if [[ $NGINX_V =~ - ]]; then
 else
   NGINX='https://nginx.org/download/nginx-'$(echo $NGINX_V |cut -d"~" -f1)'.tar.gz'
 fi
+
 OPENSSL='https://www.openssl.org/source/openssl-'$OPENSSL_V'.tar.gz'
-PCRE='https://github.com/PhilipHazel/pcre2/releases/download/pcre2-'$PCRE_V'/pcre2-'$PCRE_V'.tar.gz'
-ZLIB='https://www.zlib.net/zlib-'$ZLIB_V'.tar.gz'
+PCRE='https://github.com/PCRE2Project/pcre2/releases/download/pcre2-'$PCRE_V'/pcre2-'$PCRE_V'.tar.gz'
+ZLIB='https://github.com/madler/zlib/archive/refs/tags/v'$ZLIB_V'.tar.gz'
+
 if [[ $PHP_V =~ - ]]; then
  PHP='http://de2.php.net/distributions/php-'$(echo $PHP_V |cut -d"-" -f1)'.tar.gz'
 else
diff --git a/test/test.bats b/test/test.bats
@@ -796,7 +796,7 @@ function check_ip_not_banned(){
     if [ "$WEB_SYSTEM" != "nginx" ]; then 
       skip "FastCGI cache is not supported"
     fi
-    run v-delete-fastcgi-cache $user $domain '1m' yes
+    run v-delete-fastcgi-cache $user $domain yes
     assert_success
     refute_output
 }
diff --git a/web/add/dns/index.php b/web/add/dns/index.php
@@ -169,7 +169,7 @@
     $v_ttl = escapeshellarg($_POST['v_ttl']);
     // Add dns record
     if (empty($_SESSION['error_msg'])) {
-        exec(HESTIA_CMD."v-add-dns-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority." '' no ".$v_ttl, $output, $return_var);
+        exec(HESTIA_CMD."v-add-dns-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority." '' yes ".$v_ttl, $output, $return_var);
         check_return_code($return_var, $output);
         unset($output);
     }
diff --git a/web/edit/dns/index.php b/web/edit/dns/index.php
@@ -143,6 +143,12 @@
     if (empty($_SESSION['error_msg'])) {
         $_SESSION['ok_msg'] = _('Changes has been saved.');
     }
+    // Restart dns server
+    if (empty($_SESSION['error_msg'])) {
+        exec(HESTIA_CMD."v-restart-dns", $output, $return_var);
+        check_return_code($return_var, $output);
+        unset($output);
+    }
 }
 
 // Check POST request for dns record
@@ -162,7 +168,7 @@
         $v_val = escapeshellarg($_POST['v_val']);
         $v_priority = escapeshellarg($_POST['v_priority']);
         $v_ttl = escapeshellarg($_POST['v_ttl']);
-        exec(HESTIA_CMD."v-change-dns-record ".$user." ".$v_domain." ".$v_record_id." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority." no ".$v_ttl, $output, $return_var);
+        exec(HESTIA_CMD."v-change-dns-record ".$user." ".$v_domain." ".$v_record_id." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority." yes ".$v_ttl, $output, $return_var);
         check_return_code($return_var, $output);
         $v_rec = $_POST['v_rec'];
         $v_type = $_POST['v_type'];
diff --git a/web/inc/composer.lock b/web/inc/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# info: restart proxy server`
`3`	`3`	`# options: NONE`
`4`	`4`	`#`
`5`		`-# example: v-restart-proxy`
	`5`	`+# example: v-restart-proxy [RESTART]`
`6`	`6`	`#`
`7`	`7`	`# This function reloads proxy server configuration.`
`8`	`8`