Merge branch 'staging/1.5.6' into main

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.5.6] - Service release
+
+### Bugfixes
+
+- Fixed an issue with the installer. system.pkg didn't allow for a Web alias #2381
+- Fixed an issue with upgrade script causing command to to be executed (https://forum.hestiacp.com/t/upgrading-to-1-5-5-error-line/5449/3)
+
 ## [1.5.5] - Service release
 
 ### Features

install/deb/packages/system.pkg

@@ -3,7 +3,7 @@ PROXY_TEMPLATE='default'
 BACKEND_TEMPLATE='default'
 DNS_TEMPLATE='default'
 WEB_DOMAINS='1'
-WEB_ALIASES='0'
+WEB_ALIASES='1'
 DNS_DOMAINS='1'
 DNS_RECORDS='unlimited'
 MAIL_DOMAINS='1'

install/hst-install-debian.sh

@@ -31,7 +31,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.5.5'
+HESTIA_INSTALL_VER='1.5.6'
 # Dependencies
 pma_v='5.1.2'
 rc_v="1.5.2"

install/hst-install-ubuntu.sh

@@ -31,7 +31,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.5.5'
+HESTIA_INSTALL_VER='1.5.6'
 # Dependencies
 pma_v='5.1.2'
 rc_v="1.5.2"

install/upgrade/versions/1.5.5.sh

@@ -99,7 +99,3 @@ if [ ! -f "$HESTIA/data/packages/system.pkg" ]; then
     cp -f $HESTIA/install/deb/packages/system.pkg $HESTIA/data/packages/system.pkg
 fi
 
-echo "[ * ] Refresh Hostname SSL"
-hostname=$(hostname);
-user=$($HESTIA/bin/v-search-domain-owner "$hostname");
-$HESTIA/bin/v-update-host-certificate "$user" "$hostname"

install/upgrade/versions/1.5.6.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version 1.5.5
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+####### 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'
+
+echo "[ * ] Refresh Hostname SSL"
+hostname=$(hostname);
+user=$($HESTIA/bin/v-search-domain-owner "$hostname");
+$HESTIA/bin/v-update-host-certificate "$user" "$hostname"

src/deb/hestia/control

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