Skip to content

Commit 479cbf8

Browse files
author
Kristan Kenney
committed
Merge remote-tracking branch 'origin/fix/2020_08/fix_untranslateable_strings' into staging/fixes
2 parents accfecb + d81149b commit 479cbf8

File tree

12 files changed

+80
-83
lines changed

12 files changed

+80
-83
lines changed

‎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.2-alpha'
26+
HESTIA_INSTALL_VER='1.2.3-alpha'
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.2-alpha'
26+
HESTIA_INSTALL_VER='1.2.3-alpha'
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/upgrade/versions/latest.sh‎

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,7 @@
11
#!/bin/sh
22

3-
# Hestia Control Panel upgrade script for target version 1.2.2
3+
# Hestia Control Panel upgrade script for target version 1.2.3
44

55
#######################################################################################
66
####### Place additional commands below. #######
77
#######################################################################################
8-
9-
# Update template files to add warnings
10-
# Backup current templates
11-
echo "[ ! ] Updating default web domain templates..."
12-
$BIN/v-update-web-templates
13-
echo "[ ! ] Updating default mail domain templates..."
14-
$BIN/v-update-mail-templates
15-
echo "[ ! ] Updating default DNS zone templates..."
16-
$BIN/v-update-dns-templates
17-
18-
# Enhance Vsftpd security
19-
if [ "$FTP_SYSTEM" = "vsftpd" ]; then
20-
echo "[ ! ] Hardening Vsftpd TLS configuration..."
21-
if [ -e /etc/vsftpd.conf ]; then
22-
rm -f /etc/vsftpd.conf
23-
fi
24-
cp -f $HESTIA_INSTALL_DIR/vsftpd/vsftpd.conf /etc/
25-
chmod 644 /etc/vsftpd.conf
26-
fi
27-
28-
29-
# Rework apt repositories
30-
apt="/etc/apt/sources.list.d"
31-
echo "[ * ] Hardening APT repositories..."
32-
if [ -f "$apt/nginx.list" ]; then
33-
if grep -q "http://nginx.org/packages/mainline/" $apt/nginx.list; then
34-
echo " ----- NGINX"
35-
sed -i "s/http\:\/\/nginx.org/https\:\/\/nginx.org/g" $apt/nginx.list
36-
fi
37-
fi
38-
39-
if [ -f "$apt/php.list" ]; then
40-
if grep -q "http://packages.sury.org/" $apt/php.list; then
41-
echo " ----- PHP"
42-
sed -i "s/http\:\/\/packages.sury.org/https\:\/\/packages.sury.org/g" $apt/php.list
43-
fi
44-
fi
45-
46-
if [ -f "$apt/mariadb.list" ]; then
47-
if grep -q "http://ams2.mirrors.digitalocean.com" $apt/mariadb.list; then
48-
echo " ----- MariaDB"
49-
sed -i "s/http\:\/\/ams2.mirrors.digitalocean.com/https\:\/\/mirror.mva-n.net/g" $apt/mariadb.list
50-
fi
51-
fi
52-
53-
if [ -f "$apt/postgresql.list" ]; then
54-
if grep -q "http://apt.postgresql.org" $apt/postgresql.list; then
55-
echo " ----- PostgreSQL"
56-
sed -i "s/http\:\/\/apt.postgresql.org/https\:\/\/apt.postgresql.org/g" $apt/postgresql.list
57-
fi
58-
fi

‎install/upgrade/versions/previous/1.2.2.sh‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#!/bin/sh
2+
3+
# Hestia Control Panel upgrade script for target version 1.2.2
4+
5+
#######################################################################################
6+
####### Place additional commands below. #######
7+
#######################################################################################
8+
9+
# Enhance Vsftpd security
10+
if [ "$FTP_SYSTEM" = "vsftpd" ]; then
11+
echo "[ ! ] Hardening Vsftpd TLS configuration..."
12+
if [ -e /etc/vsftpd.conf ]; then
13+
rm -f /etc/vsftpd.conf
14+
fi
15+
cp -f $HESTIA_INSTALL_DIR/vsftpd/vsftpd.conf /etc/
16+
chmod 644 /etc/vsftpd.conf
17+
fi
18+
19+
# Rework apt repositories
20+
apt="/etc/apt/sources.list.d"
21+
echo "[ * ] Hardening APT repositories..."
22+
if [ -f "$apt/nginx.list" ]; then
23+
if grep -q "http://nginx.org/packages/mainline/" $apt/nginx.list; then
24+
echo " ----- NGINX"
25+
sed -i "s/http\:\/\/nginx.org/https\:\/\/nginx.org/g" $apt/nginx.list
26+
fi
27+
fi
28+
29+
if [ -f "$apt/php.list" ]; then
30+
if grep -q "http://packages.sury.org/" $apt/php.list; then
31+
echo " ----- PHP"
32+
sed -i "s/http\:\/\/packages.sury.org/https\:\/\/packages.sury.org/g" $apt/php.list
33+
fi
34+
fi
35+
36+
if [ -f "$apt/mariadb.list" ]; then
37+
if grep -q "http://ams2.mirrors.digitalocean.com" $apt/mariadb.list; then
38+
echo " ----- MariaDB"
39+
sed -i "s/http\:\/\/ams2.mirrors.digitalocean.com/https\:\/\/mirror.mva-n.net/g" $apt/mariadb.list
40+
fi
41+
fi
42+
43+
if [ -f "$apt/postgresql.list" ]; then
44+
if grep -q "http://apt.postgresql.org" $apt/postgresql.list; then
45+
echo " ----- PostgreSQL"
46+
sed -i "s/http\:\/\/apt.postgresql.org/https\:\/\/apt.postgresql.org/g" $apt/postgresql.list
47+
fi
48+
fi

‎src/deb/hestia/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source: hestia
22
Package: hestia
33
Priority: optional
4-
Version: 1.2.2-alpha
4+
Version: 1.2.3-alpha
55
Section: admin
66
Maintainer: HestiaCP <info@hestiacp.com>
77
Homepage: https://www.hestiacp.com

‎web/templates/admin/add_db.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@
9494
</tr>
9595
<tr>
9696
<td class="vst-text">
97-
<?php print('Your password must have at least');?>
97+
<?php print __('Your password must have at least');?>
9898
<ul>
99-
<li><?php print('8 characters long');?></li>
100-
<li><?php print('1 uppercase & 1 lowercase character');?></li>
101-
<li><?php print('1 number');?></li>
99+
<li><?php print __('8 characters long');?></li>
100+
<li><?php print __('1 uppercase & 1 lowercase character');?></li>
101+
<li><?php print __('1 number');?></li>
102102
</ul>
103103
</td>
104104
</tr>

‎web/templates/admin/add_mail_acc.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@
7878
</tr>
7979
<tr>
8080
<td class="vst-text">
81-
<?php print('Your password must have at least');?>
81+
<?php print __('Your password must have at least');?>
8282
<ul>
83-
<li><?php print('8 characters long');?></li>
84-
<li><?php print('1 uppercase & 1 lowercase character');?></li>
85-
<li><?php print('1 number');?></li>
83+
<li><?php print __('8 characters long');?></li>
84+
<li><?php print __('1 uppercase & 1 lowercase character');?></li>
85+
<li><?php print __('1 number');?></li>
8686
</ul>
8787
</td>
8888
</tr>

‎web/templates/admin/add_user.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@
7474
</tr>
7575
<tr>
7676
<td class="vst-text">
77-
<?php print('Your password must have at least');?>
77+
<?php print __('Your password must have at least');?>
7878
<ul>
79-
<li><?php print('8 characters long');?></li>
80-
<li><?php print('1 uppercase & 1 lowercase character');?></li>
81-
<li><?php print('1 number');?></li>
79+
<li><?php print __('8 characters long');?></li>
80+
<li><?php print __('1 uppercase & 1 lowercase character');?></li>
81+
<li><?php print __('1 number');?></li>
8282
</ul>
8383
</td>
8484
</tr>

‎web/templates/admin/edit_db.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@
8989
</tr>
9090
<tr>
9191
<td class="vst-text">
92-
<?php print('Your password must have at least');?>
92+
<?php print __('Your password must have at least');?>
9393
<ul>
94-
<li><?php print('8 characters long');?></li>
95-
<li><?php print('1 uppercase & 1 lowercase character');?></li>
96-
<li><?php print('1 number');?></li>
94+
<li><?php print __('8 characters long');?></li>
95+
<li><?php print __('1 uppercase & 1 lowercase character');?></li>
96+
<li><?php print __('1 number');?></li>
9797
</ul>
9898
</td>
9999
</tr>

‎web/templates/admin/edit_mail_acc.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@
7979
</tr>
8080
<tr>
8181
<td class="vst-text">
82-
<?php print('Your password must have at least');?>
82+
<?php print __('Your password must have at least');?>
8383
<ul>
84-
<li><?php print('8 characters long');?></li>
85-
<li><?php print('1 uppercase & 1 lowercase character');?></li>
86-
<li><?php print('1 number');?></li>
84+
<li><?php print __('8 characters long');?></li>
85+
<li><?php print __('1 uppercase & 1 lowercase character');?></li>
86+
<li><?php print __('1 number');?></li>
8787
</ul>
8888
</td>
8989
</tr>

0 commit comments

Comments
 (0)