Merge branch 'staging/1.7.7' into release

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.7.7] - Service release
+
+### Bugfixes
+
+- Fix #3588: Delete issue DNS record (#3589)
+- Tidy notifications copy (#3561)
+- Predefined ipset lists not loading #3552 (#3557)
+
 ## [1.7.6] - Service release
 
 ### Bugfixes

README.md

@@ -4,7 +4,7 @@
 
 <h2 align="center">Lightweight and powerful control panel for the modern web</h2>
 
-<p align="center"><strong>Latest stable release:</strong> Version 1.7.5 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
+<p align="center"><strong>Latest stable release:</strong> Version 1.7.7 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
 
 <p align="center">
 	<a href="https://www.hestiacp.com/">HestiaCP.com</a> |

bin/v-delete-remote-dns-record

@@ -42,30 +42,32 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Starting cluster loop
-IFS=$'\n'
-for cluster in $(cat $HESTIA/conf/dns-cluster.conf); do
+if [ "$DNS_CLUSTER_SYSTEM" != "hestia-zone" ]; then
+	# Starting cluster loop
+	IFS=$'\n'
+	for cluster in $(cat $HESTIA/conf/dns-cluster.conf); do
 
-	# Reset user, password and hash vars
-	clear_dns_cluster_settings
+		# Reset user, password and hash vars
+		clear_dns_cluster_settings
 
-	# Parsing remote host parameters
-	parse_object_kv_list "$cluster"
+		# Parsing remote host parameters
+		parse_object_kv_list "$cluster"
 
-	# Syncing serial
-	str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
-	cluster_cmd v-insert-dns-domain "$DNS_USER" "$str" "$HOSTNAME" 'domain' 'no'
-	check_result $? "$HOST connection failed (soa sync)" "$E_CONNECT"
+		# Syncing serial
+		str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
+		cluster_cmd v-insert-dns-domain "$DNS_USER" "$str" "$HOSTNAME" 'domain' 'no'
+		check_result $? "$HOST connection failed (soa sync)" "$E_CONNECT"
 
-	# Sync domain
-	cluster_cmd v-delete-dns-record "$DNS_USER" "$domain" "$id" 'no'
-	#check_result $? "$HOST connection failed (delete)" $E_CONNECT
+		# Sync domain
+		cluster_cmd v-delete-dns-record "$DNS_USER" "$domain" "$id" 'no'
+		#check_result $? "$HOST connection failed (delete)" $E_CONNECT
 
-	# Rebuilding dns zone
-	cluster_cmd v-rebuild-dns-domain "$DNS_USER" "$domain" 'yes' 'no'
-	check_result $? "$HOST connection failed (rebuild)" "$E_CONNECT"
+		# Rebuilding dns zone
+		cluster_cmd v-rebuild-dns-domain "$DNS_USER" "$domain" 'yes' 'no'
+		check_result $? "$HOST connection failed (rebuild)" "$E_CONNECT"
 
-done
+	done
+fi
 
 #----------------------------------------------------------#
 #                       Hestia                             #

func/upgrade.sh

@@ -189,7 +189,7 @@ upgrade_send_notification_to_panel() {
 		$BIN/v-add-user-notification admin 'Thank you for testing Hestia Control Panel '$new_version'.' '<b>Please share your feedback with our development team through our <a href="https://forum.hestiacp.com" target="_blank">discussion forum</a>.<br><br>Found a bug? <a href="https://github.com/hestiacp/hestiacp/issues" target="_blank">Open an issue on GitHub</a>!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
 	else
 		# Send normal upgrade complete notification for stable releases
-		$BIN/v-add-user-notification admin 'Upgrade complete' 'Hestia Control Panel has been updated to <b>v'$new_version'</b>.<br><a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md" target="_blank">View release notes</a><br><br>Please report any bugs or issues by <a href="https://github.com/hestiacp/hestiacp/issues" target="_blank">opening an issue on GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
+		$BIN/v-add-user-notification admin 'Upgrade complete' 'Hestia Control Panel has been updated to <b>v'$new_version'</b>.<br><a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md" target="_blank">View release notes</a><br><br>Please report any bugs by <a href="https://github.com/hestiacp/hestiacp/issues" target="_blank">opening an issue on GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
 	fi
 }
 

install/hst-install-debian.sh

@@ -32,7 +32,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.7.6'
+HESTIA_INSTALL_VER='1.7.7'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.1"
@@ -2189,7 +2189,7 @@ cat $tmpfile
 rm -f $tmpfile
 
 # Add welcome message to notification panel
-$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, view the <a href="https://hestiacp.com/docs/" target="_blank">documentation</a> or visit our <a href="https://forum.hestiacp.com/" target="_blank">user forum</a>.<br><br>Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_blank">GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
+$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, <a href="https://hestiacp.com/docs/" target="_blank">view the documentation</a> or <a href="https://forum.hestiacp.com/" target="_blank">visit our forum</a>.<br><br>Please <a href="https://github.com/hestiacp/hestiacp/issues" target="_blank">report any issues via GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
 
 # Clean-up
 # Sort final configuration file

install/hst-install-ubuntu.sh

@@ -32,7 +32,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.7.6'
+HESTIA_INSTALL_VER='1.7.7'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.1"
@@ -2228,7 +2228,7 @@ cat $tmpfile
 rm -f $tmpfile
 
 # Add welcome message to notification panel
-$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, view the <a href="https://hestiacp.com/docs/" target="_blank">documentation</a> or visit our <a href="https://forum.hestiacp.com/" target="_blank">user forum</a>.<br><br>Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_blank">GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
+$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, <a href="https://hestiacp.com/docs/" target="_blank">view the documentation</a> or <a href="https://forum.hestiacp.com/" target="_blank">visit our forum</a>.<br><br>Please <a href="https://github.com/hestiacp/hestiacp/issues" target="_blank">report any issues via GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
 
 # Clean-up
 # Sort final configuration file

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "hestia",
 	"private": true,
-	"version": "1.7.6",
+	"version": "1.7.7",
 	"description": "An open-source Linux web server control panel.",
 	"repository": "https://github.com/hestiacp/hestiacp",
 	"license": "GPL-3.0-or-later",

src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.7.6
+Version: 1.7.7
 Section: admin
 Maintainer: HestiaCP <[email protected]>
 Homepage: https://www.hestiacp.com

src/rpm/hestia/hestia.spec

@@ -1,7 +1,7 @@
 %global _hardened_build 1
 
 Name:           hestia
-Version:        1.7.6
+Version:        1.7.7
 Release:        1%{dist}
 Summary:        Hestia Control Panel
 Group:          System Environment/Base

web/js/src/ipListDataSource.js

@@ -9,8 +9,8 @@ export default function handleIpListDataSource() {
 	}
 
 	// Parse IP lists from HTML and sort them alphabetically
-	const countryIpLists = parseAndSortIpLists(dataSourceSelect.dataset.countryIpLists);
-	const blacklistIpLists = parseAndSortIpLists(dataSourceSelect.dataset.blacklistIpLists);
+	const countryIpLists = parseAndSortIpLists(dataSourceSelect.dataset.countryIplists);
+	const blacklistIpLists = parseAndSortIpLists(dataSourceSelect.dataset.blacklistIplists);
 
 	// Add IP lists to the "Data Source" select
 	addIPListsToSelect(dataSourceSelect, Alpine.store('globals').BLACKLIST, blacklistIpLists);
@@ -34,6 +34,5 @@ function addOption(element, text, value, disabled) {
 	if (disabled) {
 		option.disabled = true;
 	}
-
 	element.append(option);
 }