Skip to content

Commit 839ea53

Browse files
jaapmarcusjaapmarcus
committed
Merge branch 'staging/1.8.1' into release
2 parents 3c0b69c + 82e00c6 commit 839ea53

File tree

15 files changed

+73
-19
lines changed

15 files changed

+73
-19
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [1.8.1] - Service releae
6+
7+
- Fixed Debian 10 not working with ip adresses check
8+
- Fixed Exim4 update config via patch was unreliable added few safety checks and add notice if failed.
9+
- Fixed hestia-nginx not loading with custom port
10+
511
## [1.8.0] - Feature / Major release
612

713
### Notes

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<h2 align="center">Lightweight and powerful control panel for the modern web</h2>
66

7-
<p align="center"><strong>Latest stable release:</strong> Version 1.8.0 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
7+
<p align="center"><strong>Latest stable release:</strong> Version 1.8.1 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
88

99
<p align="center">
1010
<a href="https://www.hestiacp.com/">HestiaCP.com</a> |

‎bin/v-change-sys-port‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ check_hestia_demo_mode
5656

5757
# Get original port
5858
LISTEN_ROWS=$(cat ${NGINX_CONFIG} | grep -c "listen")
59-
ORIGINAL_PORT=$(cat ${NGINX_CONFIG} | grep -m 1 "listen" | sed 's/[^0-9]*//g')
59+
ORIGINAL_PORT=$(cat ${NGINX_CONFIG} | grep -m1 "listen" | sed 's/[^0-9]*//g')
6060

6161
# Check if port is different to nginx.conf
6262
if [ "$ORIGINAL_PORT" = "$PORT" ]; then

‎bin/v-update-sys-ip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if [ -z "$physical_nics" ]; then
4646
fi
4747

4848
for nic in $physical_nics; do
49-
nic_ipv4s="$(ip -4 -d -j addr show "$nic" | jq -r '.[].addr_info[] | if .scope == "global" then .local else empty end')"
49+
nic_ipv4s="$(ip -4 -d -j addr show "$nic" | jq -r '.[] | select(length > 0) | .addr_info[] | if .scope == "global" then .local else empty end')"
5050
if [ -z "$ips" ]; then
5151
ips="$nic_ipv4s"
5252
else

‎install/hst-install-debian.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
3131
VERBOSE='no'
3232

3333
# Define software versions
34-
HESTIA_INSTALL_VER='1.8.0'
34+
HESTIA_INSTALL_VER='1.8.1'
3535
# Dependencies
3636
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
3737
fpm_v="8.1"
@@ -2076,9 +2076,9 @@ $HESTIA/bin/v-update-sys-ip > /dev/null 2>&1
20762076
# Get primary IP
20772077
default_nic="$(ip -d -j route show | jq -r '.[] | if .dst == "default" then .dev else empty end')"
20782078
# IPv4
2079-
primary_ipv4="$(ip -4 -d -j addr show "$default_nic" | jq -r '.[].addr_info[] | if .scope == "global" then .local else empty end' | head -n1)"
2079+
primary_ipv4="$(ip -4 -d -j addr show "$default_nic" | jq -r '.[] | select(length > 0) | .addr_info[] | if .scope == "global" then .local else empty end' | head -n1)"
20802080
# IPv6
2081-
#primary_ipv6="$(ip -6 -d -j addr show "$default_nic" | jq -r '.[].addr_info[] | if .scope == "global" then .local else empty end' | head -n1)"
2081+
#primary_ipv6="$(ip -6 -d -j addr show "$default_nic" | jq -r '.[] | select(length > 0) | .addr_info[] | if .scope == "global" then .local else empty end' | head -n1)"
20822082
ip="$primary_ipv4"
20832083
local_ip="$primary_ipv4"
20842084

‎install/hst-install-ubuntu.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
3131
VERBOSE='no'
3232

3333
# Define software versions
34-
HESTIA_INSTALL_VER='1.8.0'
34+
HESTIA_INSTALL_VER='1.8.1'
3535
# Dependencies
3636
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
3737
fpm_v="8.1"

‎install/upgrade/patch/3661-exim-srs-support.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
17a18,19
2-
> SRS_SECRET = readfile{/etc/exim4/srs.conf}
2+
> SRS_SECRET = ${readfile{/etc/exim4/srs.conf}}
33
>
44
326a332,348
55
> inbound_srs:

‎install/upgrade/versions/1.8.0.sh‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,23 @@ if [ "$MAIL_SYSTEM" = "exim4" ]; then
257257
echo $srs > /etc/exim4/srs.conf
258258
chmod 640 /etc/exim4/srs.conf
259259
chown root:Debian-exim /etc/exim4/srs.conf
260-
echo "[ * ] Update exim4.conf.template ..."
261-
patch /etc/exim4/exim4.conf.template $HESTIA/install/upgrade/patch/3661-exim-srs-support.patch
260+
cp /etc/exim4/exim4.conf.template /etc/exim4/exim4.conf.template.staging
261+
patch /etc/exim4/exim4.conf.template.staging $HESTIA/install/upgrade/patch/3661-exim-srs-support.patch 2>&1
262+
exim -C /etc/exim4/exim4.conf.template.staging 2>&1
263+
if [ "$?" -ne 0 ]; then
264+
add_upgrade_message "Unable to successfully aply the SRS update patch for Exim.\n If you use SMTP relay with the SRS feature use the exim config found in /usr/local/hestia/install/deb/exim/exim4.conf.4.95.template"
265+
"$BIN"/v-add-user-notification admin "Unable to apply patch to Exim config" 'Unable to successfully apply the SRS update patch for Exim.<br /> If you use SMTP relay with the SRS feature use the exim config found in /usr/local/hestia/install/deb/exim/exim4.conf.4.95.template'
266+
if grep -qw "IMPORTANT: Manual Action Required" "$HESTIA"/data/users/admin/notifications.conf 2> /dev/null; then
267+
sed -i "s/""$(grep -m 1 "Unable to apply patch to Exim config" "$HESTIA"/data/users/admin/notifications.conf | awk '{print $1}')""/NID='3'/" "$HESTIA"/data/users/admin/notifications.conf
268+
else
269+
sed -i "s/""$(grep -m 1 "Unable to apply patch to Exim config" "$HESTIA"/data/users/admin/notifications.conf | awk '{print $1}')""/NID='2'/" "$HESTIA"/data/users/admin/notifications.conf
270+
fi
271+
echo "[ ! ] Unable to apply SRS update patch for SMTP relay"
272+
else
273+
echo "[ * ] Update exim4.conf.template ..."
274+
cp /etc/exim4/exim4.conf.template.staging /etc/exim4/exim4.conf.template
275+
fi
276+
rm /etc/exim4/exim4.conf.template.staging*
262277
else
263278
sed -i "s/SRS_SECRET = readfile{\/etc\/exim4\/srs.conf}/SRS_SECRET = \${readfile{\/etc\/exim4\/srs.conf}}/g" /etc/exim4/exim4.conf.template
264279
chown root:Debian-exim /etc/exim4/srs.conf

‎install/upgrade/versions/1.8.1.sh‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash
2+
3+
# Hestia Control Panel upgrade script for target version 1.8.0
4+
5+
#######################################################################################
6+
####### Place additional commands below. #######
7+
#######################################################################################
8+
####### upgrade_config_set_value only accepts true or false. #######
9+
####### #######
10+
####### Pass through information to the end user in case of a issue or problem #######
11+
####### #######
12+
####### Use add_upgrade_message "My message here" to include a message #######
13+
####### in the upgrade notification email. Example: #######
14+
####### #######
15+
####### add_upgrade_message "My message here" #######
16+
####### #######
17+
####### You can use \n within the string to create new lines. #######
18+
#######################################################################################
19+
20+
upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'true'
21+
upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'false'
22+
upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'true'
23+
upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'false'
24+
upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
25+
26+
if [ "$MAIL_SYSTEM" = "exim4" ]; then
27+
exim_version=$(exim4 --version | head -1 | awk '{print $3}' | cut -f -2 -d .)
28+
# if Exim version > 4.95 or greater!
29+
if version_ge "$exim_version" "4.95"; then
30+
sed -i "s/SRS_SECRET = readfile{\/etc\/exim4\/srs.conf}/SRS_SECRET = \${readfile{\/etc\/exim4\/srs.conf}}/g" /etc/exim4/exim4.conf.template
31+
chown root:Debian-exim /etc/exim4/srs.conf
32+
chown 644 /etc/exim4/srs.conf
33+
fi
34+
fi

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "hestia",
33
"private": true,
4-
"version": "1.8.0",
4+
"version": "1.8.1",
55
"description": "An open-source Linux web server control panel.",
66
"repository": "https://github.com/hestiacp/hestiacp",
77
"license": "GPL-3.0-or-later",

0 commit comments

Comments
 (0)