Skip to content

Commit af0c04d

Browse files
author
Kristan Kenney
committed
Merge branch 'staging/v1.2.2-dev' into main
2 parents 10fe02b + 1c50fce commit af0c04d

File tree

10 files changed

+369
-220
lines changed

10 files changed

+369
-220
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,28 @@ All notable changes to this project will be documented in this file.
55
### Features
66

77
### Bugfixes
8-
- Improved quality of default web domain templates for Drupal.
8+
99

1010
## [1.2.1] - Service Release 1 (beta)
1111
### Features
1212
- Consolidated First and Last Name fields to a singular name field to simply input.
1313
- v-change-user-name will now accept both "First Last" (single argument) and First Last (two arguments) for backward compatibility.
14+
- Removed ntpdate from new installations and enable systemd timesync daemon instead (thanks **@braewoods**)
1415

1516
### Bugfixes
17+
- Fixed an issue where Composer would fail to install due to missing default directory.
1618
- Corrected an issue where two-factor authentication validation was causing high CPU load during the login process. The login screen has been re-designed as a multi-step process (Username > Password > OTP PIN).
1719
- Corrected an issue where text entry fields on the login screen were not automatically focused by default.
20+
- Fixed an issue where RDNS value was incorrectly set if dig failed to resolve the server name.
1821
- Fixed an issue where icons were pushed down in the header when using Bulgarian as the display language. (#932)
1922
- Fixed an issue where new backups were not created when running v-schedule-user-backup-download. (#918)
2023
- Fixed an issue where default configuration files and templates were not backed up correctly.
2124
- Improved quality of default web domain templates for Drupal. (#916)
2225
- Added missing strings to translation files (translations to follow).
2326
- Corrected an issue where toolbars were out of place on the Mail and Firewall pages when using Bulgarian or Greek languages due to string length.
27+
- Improved Spanish translations (thanks **@Wibol**)
28+
- Improved German translations (thanks **@ronald-at**)
29+
- Improved Russian translations (thanks **@Pleskan**)
2430

2531
## [1.2.0] - Major Release (Feature / Quality Update)
2632
### Features

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
[Hestia Control Panel](https://www.hestiacp.com/)
44
==================================================
55
**Latest stable release:** Version 1.2.0 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
6+
**Latest beta release:** Version 1.2.1 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/beta/CHANGELOG.md)<br>
7+
**Latest unstable development snapshot:** Version 1.2.2 | [View Changelog](https://github.com/hestiacp/hestiacp/main/release/CHANGELOG.md)<br>
68

79
**Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
810
**Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>

‎func/upgrade.sh‎

Lines changed: 107 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,92 @@ upgrade_complete_message() {
6161

6262
upgrade_init_backup() {
6363
# Ensure that backup directories are created
64-
mkdir -p $HESTIA_BACKUP/conf/
64+
# Hestia Control Panel configuration files
65+
mkdir -p $HESTIA_BACKUP/conf/hestia/
66+
67+
# Hosting Packages
6568
mkdir -p $HESTIA_BACKUP/packages/
69+
70+
# Domain template files
6671
mkdir -p $HESTIA_BACKUP/templates/
72+
73+
# System services (apache2, nginx, bind9, vsftpd, etc).
74+
if [ ! -z "$WEB_SYSTEM" ]; then
75+
mkdir -p $HESTIA_BACKUP/conf/$WEB_SYSTEM/
76+
fi
77+
if [ ! -z "$IMAP_SYSTEM" ]; then
78+
mkdir -p $HESTIA_BACKUP/conf/$IMAP_SYSTEM/
79+
fi
80+
if [ ! -z "$MAIL_SYSTEM" ]; then
81+
mkdir -p $HESTIA_BACKUP/conf/$MAIL_SYSTEM/
82+
fi
83+
if [ ! -z "$DNS_SYSTEM" ]; then
84+
mkdir -p $HESTIA_BACKUP/conf/$DNS_SYSTEM/
85+
fi
86+
if [ ! -z "$PROXY_SYSTEM" ]; then
87+
mkdir -p $HESTIA_BACKUP/conf/$PROXY_SYSTEM/
88+
fi
89+
if [ ! -z "$DB_SYSTEM" ]; then
90+
mkdir -p $HESTIA_BACKUP/conf/$DB_SYSTEM/
91+
fi
92+
if [ ! -z "$FTP_SYSTEM" ]; then
93+
mkdir -p $HESTIA_BACKUP/conf/$FTP_SYSTEM/
94+
fi
95+
if [ ! -z "$FIREWALL_SYSTEM" ]; then
96+
mkdir -p $HESTIA_BACKUP/conf/$FIREWALL_SYSTEM/
97+
fi
98+
if [ ! -z "$FIREWALL_EXTENSION" ]; then
99+
mkdir -p $HESTIA_BACKUP/conf/$FIREWALL_EXTENSION/
100+
fi
101+
if [ -e "/etc/ssh/sshd_config" ]; then
102+
mkdir -p $HESTIA_BACKUP/conf/ssh/
103+
fi
104+
105+
echo "[ * ] Backing up existing templates and configuration files..."
106+
107+
cp -rf $HESTIA/data/packages/* $HESTIA_BACKUP/packages/
108+
109+
cp -rf $HESTIA/data/templates/* $HESTIA_BACKUP/templates/
110+
111+
# Hestia Control Panel configuration files
112+
cp -rf $HESTIA/conf/* $HESTIA_BACKUP/conf/hestia/
113+
114+
# System service configuration files (apache2, nginx, bind9, vsftpd, etc).
115+
if [ ! -z "$WEB_SYSTEM" ]; then
116+
cp -f /etc/$WEB_SYSTEM/*.conf $HESTIA_BACKUP/conf/$WEB_SYSTEM/
117+
cp -f /etc/$WEB_SYSTEM/conf.d/*.conf $HESTIA_BACKUP/conf/$WEB_SYSTEM/
118+
fi
119+
if [ ! -z "$PROXY_SYSTEM" ]; then
120+
cp -f /etc/$PROXY_SYSTEM/*.conf $HESTIA_BACKUP/conf/$PROXY_SYSTEM/
121+
cp -f /etc/$PROXY_SYSTEM/conf.d/*.conf $HESTIA_BACKUP/conf/$PROXY_SYSTEM/
122+
cp -f /etc/$PROXY_SYSTEM/conf.d/*.inc $HESTIA_BACKUP/conf/$PROXY_SYSTEM/
123+
fi
124+
if [ ! -z "$IMAP_SYSTEM" ]; then
125+
cp -f /etc/$IMAP_SYSTEM/*.conf $HESTIA_BACKUP/conf/$IMAP_SYSTEM/
126+
cp -f /etc/$IMAP_SYSTEM/conf.d/*.conf $HESTIA_BACKUP/conf/$IMAP_SYSTEM/
127+
fi
128+
if [ ! -z "$MAIL_SYSTEM" ]; then
129+
cp -f /etc/$MAIL_SYSTEM/*.conf $HESTIA_BACKUP/conf/$MAIL_SYSTEM/
130+
fi
131+
if [ ! -z "$DNS_SYSTEM" ]; then
132+
if [ "$DNS_SYSTEM" = "bind9" ]; then
133+
cp -f /etc/bind/*.conf $HESTIA_BACKUP/conf/$DNS_SYSTEM/
134+
fi
135+
fi
136+
if [ ! -z "$DB_SYSTEM" ]; then
137+
cp -f /etc/$DB_SYSTEM/*.cnf $HESTIA_BACKUP/conf/$DB_SYSTEM/
138+
cp -f /etc/$DB_SYSTEM/conf.d/*.cnf $HESTIA_BACKUP/conf/$DB_SYSTEM/
139+
fi
140+
if [ ! -z "$FTP_SYSTEM" ]; then
141+
cp -f /etc/$FTP_SYSTEM.conf $HESTIA_BACKUP/conf/$FTP_SYSTEM/
142+
fi
143+
if [ ! -z "$FIREWALL_EXTENSION" ]; then
144+
cp -f /etc/$FIREWALL_EXTENSION/*.conf $HESTIA_BACKUP/conf/$FIREWALL_EXTENSION/
145+
cp -f /etc/$FIREWALL_EXTENSION/*.local $HESTIA_BACKUP/conf/$FIREWALL_EXTENSION/
146+
fi
147+
if [ -e "/etc/ssh/sshd_config" ]; then
148+
cp -f /etc/ssh/sshd_config $HESTIA_BACKUP/conf/ssh/sshd_config
149+
fi
67150
}
68151

69152
upgrade_refresh_config() {
@@ -164,11 +247,34 @@ upgrade_start_routine() {
164247

165248
# Upgrade to Version 1.2.0
166249
if [ $VERSION = "1.1.1" ] || [ $VERSION = "1.1.2" ]; then
250+
source $HESTIA/install/upgrade/versions/previous/1.2.0.sh
251+
VERSION="1.2.1"
252+
upgrade_set_version $VERSION
253+
upgrade_refresh_config
254+
fi
255+
256+
257+
# Upgrade to Version 1.2.1
258+
if [ $VERSION = "1.2.0" ]; then
259+
# Process steps which may not have correctly executed from v1.1.0.
260+
echo
261+
echo "[ ! ] Reprocessing steps from v1.1.0 due to a previous installer bug..."
262+
echo
263+
source $HESTIA/install/upgrade/versions/previous/1.1.0.sh
264+
source $HESTIA/install/upgrade/versions/previous/1.2.0.sh
265+
VERSION="1.2.1"
266+
upgrade_refresh_config
267+
fi
268+
269+
270+
# Upgrade to Version 1.2.2
271+
if [ $VERSION = "1.2.1" ]; then
167272
source $HESTIA/install/upgrade/versions/latest.sh
168273
VERSION="$new_version"
169274
upgrade_refresh_config
170275
fi
171276

277+
172278
#####################################################################
173279
####### End version-specific upgrade instruction sets #######
174280
#####################################################################

‎install/hst-install-debian.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
2323
VERBOSE='no'
2424

2525
# Define software versions
26-
HESTIA_INSTALL_VER='1.2.0'
26+
HESTIA_INSTALL_VER='1.2.2'
2727
pma_v='5.0.2'
2828
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4")
2929
fpm_v="7.3"

‎install/hst-install-ubuntu.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
2323
VERBOSE='no'
2424

2525
# Define software versions
26-
HESTIA_INSTALL_VER='1.2.0'
26+
HESTIA_INSTALL_VER='1.2.2'
2727
pma_v='5.0.2'
2828
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4")
2929
fpm_v="7.3"

0 commit comments

Comments
 (0)