0
0
Fork 0
mirror of https://github.com/atmoz/sftp.git synced 2024-12-22 13:14:42 -05:00

Merge branch 'fix_chown_on_alpine' of https://github.com/thoralf-gutierrez/sftp into thoralf-gutierrez-fix_chown_on_alpine

This commit is contained in:
Adrian Dvergsdal 2017-06-25 15:46:56 +02:00
commit 77c0fd7860

View file

@ -62,6 +62,10 @@ function createUser() {
chown root:root /home/$user
chmod 755 /home/$user
# Retrieving user id to use it in chown commands instead of the user name
# to avoid problems on alpine when the user name contains a '.'
uid=`id $user -u`
if [ -n "$pass" ]; then
echo "$user:$pass" | chpasswd $chpasswdOptions
else
@ -71,7 +75,7 @@ function createUser() {
# Add SSH keys to authorized_keys with valid permissions
if [ -d /home/$user/.ssh/keys ]; then
cat /home/$user/.ssh/keys/* >> /home/$user/.ssh/authorized_keys
chown $user /home/$user/.ssh/authorized_keys
chown $uid /home/$user/.ssh/authorized_keys
chmod 600 /home/$user/.ssh/authorized_keys
fi
@ -82,7 +86,7 @@ function createUser() {
dirPath=/home/$user/$dirPath
echo "Creating and/or setting permissions on $dirPath"
mkdir -p $dirPath
chown -R $user:users $dirPath
chown -R $uid:users $dirPath
done
fi
}