Просмотр исходного кода

Merge pull request #2154 from hestiacp/staging/1.4.15

Staging/1.4.15
Jaap Marcus 4 лет назад
Родитель
Сommit
0c073998e0

+ 8 - 0
CHANGELOG.md

@@ -5,9 +5,17 @@ All notable changes to this project will be documented in this file.
 
 ## Features
 
+- Add templates Chevereto #2153 @ManualRechkle
+
 ### Bugfixes
 
+- Fix bug in v-add-sys-ip with netplan active
 - Limit access to files/folders that are not required on default /phpmyadmin (*.json, templates, locale, vendor) #2143
+- Update translations
+- Fix issue with Exim 4.94 and Autoreply #2151
+- Fix multiple UI bugs #2415
+- Fix link broken link to Documentation #2142 
+- Improve detection for MariaDB #2141 thanks @gejobj
 
 ## [1.4.14] - Service release 
 

+ 1 - 1
README.md

@@ -2,7 +2,7 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.4.14 | [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.4.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>
 
 **Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
 **Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>

+ 1 - 1
func/upgrade.sh

@@ -439,7 +439,7 @@ upgrade_start_backup() {
         if [ "$DEBUG_MODE" = "true" ]; then
             echo "      ---- sshd"
         fi
-        cp -f /etc/ssh/* $HESTIA_BACKUP/conf/ssh/
+        cp -fr /etc/ssh/* $HESTIA_BACKUP/conf/ssh/
     fi
     if [ -d "/etc/roundcube" ]; then
         if [ "$DEBUG_MODE" = "true" ]; then

+ 1 - 1
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.15~alpha'
+HESTIA_INSTALL_VER='1.4.15'
 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")

+ 1 - 1
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.15~alpha'
+HESTIA_INSTALL_VER='1.4.15'
 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")

+ 11 - 11
install/upgrade/upgrade.conf

@@ -21,29 +21,29 @@
 # Update default templates when performing an upgrade
 # These flags should be set to true if any changes are made to the template files
 # to ensure that they are properly updated on the end-user's system.
-UPGRADE_UPDATE_WEB_TEMPLATES='false'
-UPGRADE_UPDATE_MAIL_TEMPLATES='false'
-UPGRADE_UPDATE_DNS_TEMPLATES='false'
+UPGRADE_UPDATE_WEB_TEMPLATES='true'
+UPGRADE_UPDATE_MAIL_TEMPLATES='true'
+UPGRADE_UPDATE_DNS_TEMPLATES='true'
 
 # Update phpMyAdmin to the latest version during upgrade
-UPGRADE_UPDATE_PHPMYADMIN='false'
+UPGRADE_UPDATE_PHPMYADMIN='true'
 
 # Update roundcube to the latest version during upgrade
-UPGRADE_UPDATE_ROUNDCUBE='false'
+UPGRADE_UPDATE_ROUNDCUBE='true'
 
 # Update rainloop to the latest version during upgrade
-UPGRADE_UPDATE_RAINLOOP='false'
+UPGRADE_UPDATE_RAINLOOP='true'
 
 # Update the File Manager or it's configuration file
 # UPGRADE_UPDATE_FILEMANAGER: Performs an upgrade/repair install of the File Manager
 # UPGRADE_UPDATE_FILEMANAGER_CONFIG: Updates only the configuration file
-UPGRADE_UPDATE_FILEMANAGER='false'
-UPGRADE_UPDATE_FILEMANAGER_CONFIG='false'
+UPGRADE_UPDATE_FILEMANAGER='true'
+UPGRADE_UPDATE_FILEMANAGER_CONFIG='true'
 
 # Post installation clean-up
-UPGRADE_REPLACE_KNOWN_KEYS='false'
-UPGRADE_REBUILD_USERS='false'
-UPGRADE_RESTART_SERVICES='false'
+UPGRADE_REPLACE_KNOWN_KEYS='true'
+UPGRADE_REBUILD_USERS='true'
+UPGRADE_RESTART_SERVICES='true'
 
 #######################################################################################
 #######                        3rd Party Software Updates                       #######

+ 1 - 1
src/deb/hestia/control

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