Skip to content

Commit b71ffd0

Browse files
committed
fix: Améliorer la gestion du montage S3FS pour les utilisateurs SFTP et simplifier le code
1 parent 3bd1fd0 commit b71ffd0

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

sftp/common/usr/local/bin/create-sftp-user

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -105,31 +105,25 @@ if [ -d "$userKeysQueuedDir" ]; then
105105
chmod 600 "$userKeysAllowedFile"
106106
fi
107107

108+
if [ "$S3FS_ENABLED" = "true" ] || [ "$S3FS_ENABLED" = "1" ]; then
109+
log "Mounting ${S3FS_MOUNT}/${user} to /home/${user}"
110+
mkdir -p "${S3FS_MOUNT}/${user}"
111+
bindmount "${S3FS_MOUNT}/${user}" "/home/${user}"
112+
fi
113+
chown -R "$uid:users" "/home/$user"
114+
108115
# Make sure dirs exists
109116
if [ -n "$dir" ]; then
110117
IFS=',' read -ra dirArgs <<< "$dir"
111118
for dirPath in "${dirArgs[@]}"; do
112119
dirPath="/home/$user/$dirPath"
113120
if [ ! -d "$dirPath" ]; then
114121
log "Creating directory: $dirPath"
115-
116-
if [ "$S3FS_ENABLED" = "true" ] || [ "$S3FS_ENABLED" = "1" ]; then
117-
log "Mounting ${S3FS_MOUNT}/${user} to /home/${user}"
118-
mkdir -p "${S3FS_MOUNT}/${user}"
119-
bindmount "${S3FS_MOUNT}/${user}" "/home/${user}"
120-
fi
121-
122122
mkdir -p "$dirPath"
123123
else
124124
log "Directory already exists: $dirPath"
125-
if [ "$S3FS_ENABLED" = "true" ] || [ "$S3FS_ENABLED" = "1" ]; then
126-
log "Mounting ${S3FS_MOUNT}/${user} to /home/${user}"
127-
mkdir -p "${S3FS_MOUNT}/${user}"
128-
bindmount "${S3FS_MOUNT}/${user}" "/home/${user}"
129-
fi
130125
fi
131126

132-
chown -R "$uid:users" "/home/$user"
133127
chown -R "$uid:users" "$dirPath"
134128
done
135129
fi

0 commit comments

Comments
 (0)