Ver código fonte

Merge pull request #611 from Lupul/dev-1012

Dev 1012
Zollner Robert 6 anos atrás
pai
commit
acd44fb0bb
3 arquivos alterados com 22 adições e 7 exclusões
  1. 10 3
      bin/v-add-user
  2. 1 1
      bin/v-delete-firewall-ban
  3. 11 3
      install/upgrade/versions/latest.sh

+ 10 - 3
bin/v-add-user

@@ -98,9 +98,16 @@ if [ ! -z "$DNS_SYSTEM" ]; then
 fi 
 fi 
 
 
 # Create default writeable folders
 # Create default writeable folders
-mkdir $HOMEDIR/$user/.config $HOMEDIR/$user/.local $HOMEDIR/$user/.composer
-chown $user:$user $HOMEDIR/$user/.config $HOMEDIR/$user/.local \
-                  $HOMEDIR/$user/.composer
+mkdir $HOMEDIR/$user/.config \
+      $HOMEDIR/$user/.local \
+      $HOMEDIR/$user/.composer \
+      $HOMEDIR/$user/.ssh
+
+chown $user:$user \
+      $HOMEDIR/$user/.config \
+      $HOMEDIR/$user/.local \
+      $HOMEDIR/$user/.composer \
+      $HOMEDIR/$user/.ssh
 
 
 # Set permissions
 # Set permissions
 chmod a+x $HOMEDIR/$user
 chmod a+x $HOMEDIR/$user

+ 1 - 1
bin/v-delete-firewall-ban

@@ -50,7 +50,7 @@ fi
 # Deleting ip from banlist
 # Deleting ip from banlist
 sip=$(echo "$ip"| sed "s|/|\\\/|g")
 sip=$(echo "$ip"| sed "s|/|\\\/|g")
 sed -i "/IP='$sip' CHAIN='$chain'/d" $conf
 sed -i "/IP='$sip' CHAIN='$chain'/d" $conf
-b=$($iptables -L fail2ban-$chain --line-number -n|grep $ip|awk '{print $1}')
+b=$($iptables -L fail2ban-$chain --line-number -n|grep -w $ip|awk '{print $1}')
 $iptables -D fail2ban-$chain $b 2>/dev/null
 $iptables -D fail2ban-$chain $b 2>/dev/null
 
 
 # Changing permissions
 # Changing permissions

+ 11 - 3
install/upgrade/versions/latest.sh

@@ -79,7 +79,15 @@ fi
 # Create default writeable folders for all users
 # Create default writeable folders for all users
 echo "(*) Updating default writable folders for all users..."
 echo "(*) Updating default writable folders for all users..."
 for user in $($HESTIA/bin/v-list-sys-users plain); do
 for user in $($HESTIA/bin/v-list-sys-users plain); do
-    mkdir -p $HOMEDIR/$user/.config $HOMEDIR/$user/.local $HOMEDIR/$user/.composer
-    chown $user:$user $HOMEDIR/$user/.config $HOMEDIR/$user/.local \
-                      $HOMEDIR/$user/.composer
+    mkdir -p \
+        $HOMEDIR/$user/.config \
+        $HOMEDIR/$user/.local \
+        $HOMEDIR/$user/.composer \
+        $HOMEDIR/$user/.ssh
+
+    chown $user:$user \
+        $HOMEDIR/$user/.config \
+        $HOMEDIR/$user/.local \
+        $HOMEDIR/$user/.composer \
+        $HOMEDIR/$user/.ssh
 done
 done