Skip to content

Commit c74e34b

Browse files
authored
Fix bug in v-change-sys-port (hestiacp#2982)
* Fix error in v-add-user-2fa /usr/local/hestia/bin/v-add-user-2fa: line 45: exit: : numeric argument required * Fix bug in v-change-sys-port sed: can’t read /usr/local/hestia/data/firewall/chains.conf: No such file or directory
1 parent d8e5823 commit c74e34b

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

bin/v-add-user-2fa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ source $USER_DATA/user.conf
4242
# Check if 2FA is already enabled
4343
if [ -n "$TWOFA" ]; then
4444
echo "Error: 2FA already enabled"
45-
exit "$E_EXIST"
45+
exit "$E_EXISTS"
4646
fi
4747

4848
# Get secret and qr code from 2fa libary

bin/v-change-sys-port

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,14 @@ else
7171
if [ -d /etc/rainloop/ ]; then
7272
sed -i "/hestia_port/c\hestia_port = $PORT" /etc/rainloop/data/_data_/_default_/configs/plugin-hestia-change-password.ini
7373
fi
74-
sed -i "/COMMENT='HESTIA'/c\RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='$PORT' IP='0.0.0.0/0' COMMENT='HESTIA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25'" $HESTIA/data/firewall/rules.conf
75-
sed -i "/CHAIN='HESTIA'/c\CHAIN='HESTIA' PORT='$PORT' PROTOCOL='TCP'" $HESTIA/data/firewall/chains.conf
74+
75+
if [ -f "$HESTIA/data/firewall/rules.conf" ]; then
76+
sed -i "/COMMENT='HESTIA'/c\RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='$PORT' IP='0.0.0.0/0' COMMENT='HESTIA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25'" $HESTIA/data/firewall/rules.conf
77+
fi
78+
79+
if [ -f $HESTIA/data/firewall/chains.conf ]; then
80+
sed -i "/CHAIN='HESTIA'/c\CHAIN='HESTIA' PORT='$PORT' PROTOCOL='TCP'" $HESTIA/data/firewall/chains.conf
81+
fi
7682

7783
# Restart services
7884
if [ -n "$FIREWALL_SYSTEM" ] && [ "$FIREWALL_SYSTEM" != no ]; then

0 commit comments

Comments
 (0)