Skip to content

Commit acd44fb

Browse files
authored
Merge pull request hestiacp#611 from Lupul/dev-1012
Dev 1012
2 parents c3ec5a9 + f5e67e2 commit acd44fb

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

bin/v-add-user

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,16 @@ if [ ! -z "$DNS_SYSTEM" ]; then
9898
fi
9999

100100
# Create default writeable folders
101-
mkdir $HOMEDIR/$user/.config $HOMEDIR/$user/.local $HOMEDIR/$user/.composer
102-
chown $user:$user $HOMEDIR/$user/.config $HOMEDIR/$user/.local \
103-
$HOMEDIR/$user/.composer
101+
mkdir $HOMEDIR/$user/.config \
102+
$HOMEDIR/$user/.local \
103+
$HOMEDIR/$user/.composer \
104+
$HOMEDIR/$user/.ssh
105+
106+
chown $user:$user \
107+
$HOMEDIR/$user/.config \
108+
$HOMEDIR/$user/.local \
109+
$HOMEDIR/$user/.composer \
110+
$HOMEDIR/$user/.ssh
104111

105112
# Set permissions
106113
chmod a+x $HOMEDIR/$user

bin/v-delete-firewall-ban

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fi
5050
# Deleting ip from banlist
5151
sip=$(echo "$ip"| sed "s|/|\\\/|g")
5252
sed -i "/IP='$sip' CHAIN='$chain'/d" $conf
53-
b=$($iptables -L fail2ban-$chain --line-number -n|grep $ip|awk '{print $1}')
53+
b=$($iptables -L fail2ban-$chain --line-number -n|grep -w $ip|awk '{print $1}')
5454
$iptables -D fail2ban-$chain $b 2>/dev/null
5555

5656
# Changing permissions

install/upgrade/versions/latest.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,15 @@ fi
7979
# Create default writeable folders for all users
8080
echo "(*) Updating default writable folders for all users..."
8181
for user in $($HESTIA/bin/v-list-sys-users plain); do
82-
mkdir -p $HOMEDIR/$user/.config $HOMEDIR/$user/.local $HOMEDIR/$user/.composer
83-
chown $user:$user $HOMEDIR/$user/.config $HOMEDIR/$user/.local \
84-
$HOMEDIR/$user/.composer
82+
mkdir -p \
83+
$HOMEDIR/$user/.config \
84+
$HOMEDIR/$user/.local \
85+
$HOMEDIR/$user/.composer \
86+
$HOMEDIR/$user/.ssh
87+
88+
chown $user:$user \
89+
$HOMEDIR/$user/.config \
90+
$HOMEDIR/$user/.local \
91+
$HOMEDIR/$user/.composer \
92+
$HOMEDIR/$user/.ssh
8593
done

0 commit comments

Comments
 (0)