Skip to content

Commit 26934cb

Browse files
committed
revert back 1.4.11.sh to 1.4.11 version
1 parent 56c193a commit 26934cb

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

install/upgrade/versions/1.4.11.sh

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,27 @@
11
#!/bin/bash
22

3-
# Hestia Control Panel upgrade script for target version 1.4.12
3+
# Hestia Control Panel upgrade script for target version 1.4.11
44

55
#######################################################################################
66
####### Place additional commands below. #######
77
#######################################################################################
88

9+
# Fix the potential issue of loading firewall rules
10+
if [ "$FIREWALL_SYSTEM" = "iptables" ]; then
11+
echo "[ * ] Fix the potential issue of loading firewall rules..."
12+
# Just in case, delete the legacy version loading script again to prevent any residue
13+
rm -f /usr/lib/networkd-dispatcher/routable.d/50-ifup-hooks /etc/network/if-pre-up.d/iptables
14+
# The firewall rules are loading by Systemd, the old loading script is no longer needed
15+
rm -f /usr/lib/networkd-dispatcher/routable.d/10-hestia-iptables /etc/network/if-pre-up.d/hestia-iptables
16+
$BIN/v-update-firewall
17+
fi
18+
19+
if [ -f "/etc/exim4/exim4.conf.template" ]; then
20+
test=$(grep 'require_files = ${local_part}:+${home}/.forward' /etc/exim4/exim4.conf.template)
21+
if [ -z "$test" ]; then
22+
echo "[ * ] Fix bug where email send to news@domain.com is handled by /var/spool/news"
23+
insert="\ require_files = \${local_part}:+\${home}/.forward\n\ domains = +local_domains"
24+
line=$(expr $(sed -n '/userforward/=' /etc/exim4/exim4.conf.template) + 1)
25+
sed -i "${line}i $insert" /etc/exim4/exim4.conf.template
26+
fi
27+
fi

install/upgrade/versions/1.4.12.sh

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,7 @@
11
#!/bin/bash
22

3-
# Hestia Control Panel upgrade script for target version 1.4.11
3+
# Hestia Control Panel upgrade script for target version 1.4.12
44

55
#######################################################################################
66
####### Place additional commands below. #######
77
#######################################################################################
8-
9-
# Fix the potential issue of loading firewall rules
10-
if [ "$FIREWALL_SYSTEM" = "iptables" ]; then
11-
echo "[ * ] Fix the potential issue of loading firewall rules..."
12-
# Just in case, delete the legacy version loading script again to prevent any residue
13-
rm -f /usr/lib/networkd-dispatcher/routable.d/50-ifup-hooks /etc/network/if-pre-up.d/iptables
14-
# The firewall rules are loading by Systemd, the old loading script is no longer needed
15-
rm -f /usr/lib/networkd-dispatcher/routable.d/10-hestia-iptables /etc/network/if-pre-up.d/hestia-iptables
16-
$BIN/v-update-firewall
17-
fi
18-
19-
if [ -f "/etc/exim4/exim4.conf.template" ]; then
20-
test=$(grep 'require_files = ${local_part}:+${home}/.forward' /etc/exim4/exim4.conf.template)
21-
if [ -z "$test" ]; then
22-
echo "[ * ] Fix bug where email send to news@domain.com is handled by /var/spool/news"
23-
insert="\ require_files = \${local_part}:+\${home}/.forward\n\ domains = +local_domains"
24-
line=$(expr $(sed -n '/userforward/=' /etc/exim4/exim4.conf.template) + 1)
25-
sed -i "${line}i $insert" /etc/exim4/exim4.conf.template
26-
fi
27-
fi

0 commit comments

Comments
 (0)