Explorar el Código

Fix bug in v-change-sys-port (#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
Jaap Marcus hace 3 años
padre
commit
c74e34bbfa
Se han modificado 2 ficheros con 9 adiciones y 3 borrados
  1. 1 1
      bin/v-add-user-2fa
  2. 8 2
      bin/v-change-sys-port

+ 1 - 1
bin/v-add-user-2fa

@@ -42,7 +42,7 @@ source $USER_DATA/user.conf
 # Check if 2FA is already enabled
 if [ -n "$TWOFA" ]; then
     echo "Error: 2FA already enabled"
-    exit "$E_EXIST"
+    exit "$E_EXISTS"
 fi
 
 # Get secret and qr code from 2fa libary

+ 8 - 2
bin/v-change-sys-port

@@ -71,8 +71,14 @@ else
     if [ -d /etc/rainloop/ ]; then
         sed -i "/hestia_port/c\hestia_port = $PORT" /etc/rainloop/data/_data_/_default_/configs/plugin-hestia-change-password.ini
     fi
-    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
-    sed -i "/CHAIN='HESTIA'/c\CHAIN='HESTIA' PORT='$PORT' PROTOCOL='TCP'" $HESTIA/data/firewall/chains.conf
+    
+    if [ -f "$HESTIA/data/firewall/rules.conf" ]; then
+        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
+    fi
+    
+    if [ -f $HESTIA/data/firewall/chains.conf ]; then
+        sed -i "/CHAIN='HESTIA'/c\CHAIN='HESTIA' PORT='$PORT' PROTOCOL='TCP'" $HESTIA/data/firewall/chains.conf
+    fi
      
     # Restart services
     if [ -n "$FIREWALL_SYSTEM" ] && [ "$FIREWALL_SYSTEM" != no ]; then