Merge branch 'servicing' into release

hestiacp · Aug 11, 2023 · b00de25 · b00de25
2 parents f374353 + fdd47a9
commit b00de25
Show file tree

Hide file tree

Showing 69 changed files with 1,053 additions and 576 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.8.5] - Service release
+
+### Bugfixes
+
+- Fixed an error that could occur when adding a new package (#3883)
+- Fixed an issue in `v-list-sys-interfaces` (#3912)
+- Minor refactoring of user interface code (#3893)
+- Improved shell output of `v-list-web-domain` (#3888, thanks #hudokkow)
+- Fixed a bug in `v-delete-sys-ip` on Ubuntu systems (#3894)
+- Add user role details to `v-list-users` (#3898)
+- Rename "Comment" to "Chain" in Firewall UI to better reflect the fields purpose (#3901)
+- Updated translations (#3907)
+
 ## [1.8.4] - Service release
 
 ### Bugfixes

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 <h2 align="center">A lightweight and powerful control panel for the modern web</h2>
 
-<p align="center"><strong>Latest stable release:</strong> Version 1.8.4 | <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.8.5 | <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> |

diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip
@@ -77,7 +77,7 @@ fi
 
 # Deleting startup conf on Debian/Ubuntu
 if [ -f "/etc/netplan/60-hestia.yaml" ]; then
-	sed -i "/$ip/d" /etc/netplan/60-hestia.yaml
+	sed -i "/$ip\//d" /etc/netplan/60-hestia.yaml
 	if ! grep -q '-' /etc/netplan/60-hestia.yaml; then
 		rm /etc/netplan/60-hestia.yaml
 	fi

diff --git a/bin/v-list-sys-interfaces b/bin/v-list-sys-interfaces
@@ -68,10 +68,7 @@ csv_list() {
 
 # Defining interface list
 # Detect "physical" NICs only (virtual NICs created by Docker, WireGuard etc. are excluded)
-physical_nics="$(ip -d -j link show | jq -r '.[] | if .link_type == "loopback" // .linkinfo.info_kind then empty else .ifname end')"
-if [ -z "$physical_nics" ]; then
-	physical_nics="$(ip -d -j link show | jq -r '.[] | if .link_type == "loopback" then empty else .ifname end')"
-fi
+physical_nics="$(ip -d -j link show | jq -r '.[] | if .link_type == "loopback" then empty else .ifname end')"
 
 # Listing data
 case $format in

diff --git a/bin/v-list-users b/bin/v-list-users
@@ -56,6 +56,7 @@ json_list() {
         "CONTACT": "'$CONTACT'",
         "CRON_REPORTS": "'$CRON_REPORTS'",
         "RKEY": "'$RKEY'",
+        "ROLE": "'$ROLE'",
         "SUSPENDED": "'$SUSPENDED'",
         "SUSPENDED_USERS": "'$SUSPENDED_USERS'",
         "SUSPENDED_WEB": "'$SUSPENDED_WEB'",
@@ -94,14 +95,14 @@ json_list() {
 
 # SHELL list function
 shell_list() {
-	echo "USER   PKG   WEB   DNS   MAIL   DB   DISK   BW   SPND   DATE"
-	echo "----   ---   ---   ---   ---    --   ----   --   ----   ----"
+	echo "USER   ROLE   PKG   WEB   DNS   MAIL   DB   DISK   BW   SPND   DATE"
+	echo "----   ----   ---   ---   ---   ---    --   ----   --   ----   ----"
 	while read USER; do
 		if [ ! -f "$HESTIA/data/users/$USER/user.conf" ]; then
 			continue
 		fi
 		source_conf "$HESTIA/data/users/$USER/user.conf"
-		echo -n "$USER $PACKAGE $U_WEB_DOMAINS $U_DNS_DOMAINS $U_MAIL_DOMAINS"
+		echo -n "$USER $ROLE $PACKAGE $U_WEB_DOMAINS $U_DNS_DOMAINS $U_MAIL_DOMAINS"
 		echo " $U_DATABASES $U_DISK $U_BANDWIDTH $SUSPENDED $DATE"
 	done < <(grep '@' /etc/passwd | cut -f1 -d:)
 }
@@ -118,7 +119,7 @@ plain_list() {
 		echo -ne "$WEB_DOMAINS\t$WEB_ALIASES\t$DNS_DOMAINS\t$DNS_RECORDS\t"
 		echo -ne "$MAIL_DOMAINS\t$MAIL_ACCOUNTS\t$DATABASES\t$CRON_JOBS\t"
 		echo -ne "$DISK_QUOTA\t$BANDWIDTH\t$NS\t$SHELL\t$BACKUPS\t"
-		echo -ne "$CONTACT\t$CRON_REPORTS\t$RKEY\t$SUSPENDED\t"
+		echo -ne "$CONTACT\t$CRON_REPORTS\t$RKEY\t$ROLE\t$SUSPENDED\t"
 		echo -ne "$SUSPENDED_USERS\t$SUSPENDED_WEB\t$SUSPENDED_DNS\t"
 		echo -ne "$SUSPENDED_MAIL\t$SUSPENDED_DB\t$SUSPENDED_CRON\t"
 		echo -ne "$IP_AVAIL\t$IP_OWNED\t$U_USERS\t$U_DISK\t$U_DISK_DIRS\t"
@@ -136,7 +137,7 @@ csv_list() {
 	echo -n "PROXY_TEMPLATE,DNS_TEMPLATE,WEB_DOMAINS,WEB_ALIASES,"
 	echo -n "DNS_DOMAINS,DNS_RECORDS,MAIL_DOMAINS,MAIL_ACCOUNTS,"
 	echo -n "DATABASES,CRON_JOBS,DISK_QUOTA,BANDWIDTH,NS,HOME,SHELL,"
-	echo -n "BACKUPS,CONTACT,CRON_REPORTS,RKEY,SUSPENDED,SUSPENDED_USERS,"
+	echo -n "BACKUPS,CONTACT,CRON_REPORTS,RKEY,ROLE,SUSPENDED,SUSPENDED_USERS,"
 	echo -n "SUSPENDED_WEB,SUSPENDED_DNS,SUSPENDED_MAIL,SUSPENDED_DB,"
 	echo -n "SUSPENDED_CRON,IP_AVAIL,IP_OWNED,U_USERS,U_DISK,U_DISK_DIRS,"
 	echo -n "U_DISK_WEB,U_DISK_MAIL,U_DISK_DB,U_BANDWIDTH,U_WEB_DOMAINS,"
@@ -153,7 +154,7 @@ csv_list() {
 		echo -n "$WEB_DOMAINS,$WEB_ALIASES,$DNS_DOMAINS,$DNS_RECORDS,"
 		echo -n "$MAIL_DOMAINS,$MAIL_ACCOUNTS,$DATABASES,$CRON_JOBS,"
 		echo -n "$DISK_QUOTA,$BANDWIDTH,\"$NS\",$HOME,$SHELL,$BACKUPS,"
-		echo -n "$CONTACT,$CRON_REPORTS,\"$RKEY\",$SUSPENDED,"
+		echo -n "$CONTACT,$CRON_REPORTS,\"$RKEY\",$ROLE,$SUSPENDED,"
 		echo -n "$SUSPENDED_USERS,$SUSPENDED_WEB,$SUSPENDED_DNS,"
 		echo -n "$SUSPENDED_MAIL,$SUSPENDED_DB,$SUSPENDED_CRON,$IP_AVAIL,"
 		echo -n "$IP_OWNED,$U_USERS,$U_DISK,$U_DISK_DIRS,$U_DISK_WEB,"

diff --git a/bin/v-list-web-domain b/bin/v-list-web-domain
@@ -61,47 +61,64 @@ json_list() {
 
 # SHELL list function
 shell_list() {
-	echo "DOMAIN:         $DOMAIN"
-	echo "ALIAS:          ${ALIAS//,/ }"
-	echo "IP:             $IP"
-	echo "DOCUMENT_ROOT:  $DOCROOT"
+	echo "DOMAIN:           $DOMAIN"
+	echo "ALIAS:            ${ALIAS//,/ }"
+	echo "IP:               $IP"
+	echo "DOCUMENT_ROOT:    $DOCROOT"
 	if [ -n "$IP6" ]; then
-		echo "IP6:            $IP6"
+		echo "IP6:              $IP6"
 	fi
 	if [ -n "$SSL" ] && [ "$SSL" != 'no' ]; then
-		echo "SSL:            $SSL / $SSL_HOME"
+		echo "SSL:              $SSL / $SSL_HOME"
 		if [ -n "$LETSENCRYPT" ] && [ "$LETSENCRYPT" != 'no' ]; then
-			echo "LETSENCRYPT:    $LETSENCRYPT"
+			echo "LETSENCRYPT:      $LETSENCRYPT"
 		fi
 		if [ -n "$SSL_FORCE" ]; then
-			echo "SSL_FORCE:       $SSL_FORCE"
+			echo "SSL_FORCE:        $SSL_FORCE"
 		fi
 		if [ -n "$SSL_HSTS" ]; then
-			echo "SSL_HSTS:       $SSL_HSTS"
+			echo "SSL_HSTS:         $SSL_HSTS"
 		fi
 	fi
-	echo "TEMPLATE:       $TPL"
+	echo "TEMPLATE:         $TPL"
 	if [ -n "$WEB_BACKEND" ]; then
-		echo "BACKEND:        $BACKEND"
+		echo "BACKEND:          $BACKEND"
 	fi
 	if [ -n "$PROXY_SYSTEM" ]; then
-		echo "PROXY:          $PROXY"
-		echo "PROXY EXT:      ${PROXY_EXT//,/ }"
+		echo "PROXY:            $PROXY"
+		echo "PROXY EXT:        ${PROXY_EXT//,/ }"
 	fi
 	if [ -n "$STATS" ]; then
-		echo "STATS:          $STATS"
+		echo "STATS:            $STATS"
+	fi
+	if [ "$FASTCGI_CACHE" = "yes" ]; then
+		echo "FASTCGI_CACHE:    $FASTCGI_CACHE"
+		echo "FASTCGI_DURATION: $FASTCGI_DURATION"
+	fi
+	if [ -n "$REDIRECT" ]; then
+		echo "REDIRECT:         $REDIRECT"
+		echo "REDIRECT_CODE:    $REDIRECT_CODE"
+	fi
+	if [ -n "$CUSTOM_DOCROOT" ]; then
+		echo "CUSTOM_DOCROOT:   $CUSTOM_DOCROOT"
+	fi
+	if [ -n "$STATS_USER" ]; then
+		echo "STATS_USER:       $STATS_USER"
 	fi
 	if [ -n "$FTP_USER" ]; then
-		echo "FTP_USER:       ${FTP_USER//,/, }"
+		echo "FTP_USER:         ${FTP_USER//,/, }"
+	fi
+	if [ -n "$FTP_PATH" ]; then
+		echo "FTP_PATH:         ${FTP_PATH}"
 	fi
 	if [ -n "$AUTH_USER" ]; then
-		echo "HTTP_AUTH:      $AUTH_USER"
+		echo "HTTP_AUTH:        $AUTH_USER"
 	fi
-	echo "DISK:           $U_DISK"
-	echo "BW:             $U_BANDWIDTH"
-	echo "SUSPENDED:      $SUSPENDED"
-	echo "TIME:           $TIME"
-	echo "DATE:           $DATE"
+	echo "DISK:             $U_DISK"
+	echo "BW:               $U_BANDWIDTH"
+	echo "SUSPENDED:        $SUSPENDED"
+	echo "TIME:             $TIME"
+	echo "DATE:             $DATE"
 }
 
 # PLAIN list function

diff --git a/docs/_data/languages.js b/docs/_data/languages.js
@@ -1,4 +1,5 @@
 export const languages = [
+	{ text: 'Albanian', value: 'sq' },
 	{ text: 'Arabic', value: 'ar' },
 	{ text: 'Armenian', value: 'hy' },
 	{ text: 'Azerbaijani', value: 'az' },

diff --git a/install/hst-install-debian.sh b/install/hst-install-debian.sh
@@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.8.4'
+HESTIA_INSTALL_VER='1.8.5'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.2"
@@ -127,7 +127,7 @@ set_default_lang() {
 	if [ -z "$lang" ]; then
 		eval lang=$1
 	fi
-	lang_list="ar az bg bn bs ca cs da de el en es fa fi fr hr hu id it ja ka ku ko nl no pl pt pt-br ro ru sk sr sv th tr uk ur vi zh-cn zh-tw"
+	lang_list="ar az bg bn bs ca cs da de el en es fa fi fr hr hu id it ja ka ku ko nl no pl pt pt-br ro ru sk sq sr sv th tr uk ur vi zh-cn zh-tw"
 	if ! (echo $lang_list | grep -w $lang > /dev/null 2>&1); then
 		eval lang=$1
 	fi

diff --git a/install/hst-install-ubuntu.sh b/install/hst-install-ubuntu.sh
@@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.8.4'
+HESTIA_INSTALL_VER='1.8.5'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.2"
@@ -127,7 +127,7 @@ set_default_lang() {
 	if [ -z "$lang" ]; then
 		eval lang=$1
 	fi
-	lang_list="ar az bg bn bs ca cs da de el en es fa fi fr hr hu id it ja ka ku ko nl no pl pt pt-br ro ru sk sr sv th tr uk ur vi zh-cn zh-tw"
+	lang_list="ar az bg bn bs ca cs da de el en es fa fi fr hr hu id it ja ka ku ko nl no pl pt pt-br ro ru sk sq sr sv th tr uk ur vi zh-cn zh-tw"
 	if ! (echo $lang_list | grep -w $lang > /dev/null 2>&1); then
 		eval lang=$1
 	fi

diff --git a/install/upgrade/upgrade.conf b/install/upgrade/upgrade.conf
@@ -46,7 +46,7 @@ multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 pma_v='5.2.1'
 
 # Set version of phppgadmin to install during upgrade if not already installed
-pga_v='7.14.4'
+pga_v='7.14.5'
 
 # Set version of RoundCube (Webmail) to update during upgrade if not already installed
 # Note: only applies to "non-apt installs >= 1.4.0 or manually phased out"

diff --git a/install/upgrade/versions/1.8.5.sh b/install/upgrade/versions/1.8.5.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version 1.8.5
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+####### upgrade_config_set_value only accepts true or false.                    #######
+#######                                                                         #######
+####### Pass through information to the end user in case of a issue or problem  #######
+#######                                                                         #######
+####### Use add_upgrade_message "My message here" to include a message          #######
+####### in the upgrade notification email. Example:                             #######
+#######                                                                         #######
+####### add_upgrade_message "My message here"                                   #######
+#######                                                                         #######
+####### You can use \n within the string to create new lines.                   #######
+#######################################################################################
+
+upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'false'
+upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'false'
+upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'false'
+upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'false'
+upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'