Skip to content

Commit 792eb94

Browse files
committed
Fix mutiple issues with restore
hestiacp#1545 Additional FTP users are now able to create files hestiacp#1739 Path get lost ( Other issue is fixed asswell) hestiacp#1723 $new_user got appended where it was not needed
1 parent bb76f91 commit 792eb94

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

bin/v-restore-user

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,6 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
287287
FTP_USER="${user}_${FTP_USER}"
288288
fi
289289

290-
# Converting stats users
291-
if [ ! -z "$STATS_USER" ]; then
292-
STATS_USER=$(echo "$STATS_USER" |sed -e "s/${old_user}_//")
293-
STATS_USER="${user}_${STATS_USER}"
294-
fi
295-
296290
# Copying SSL certificates
297291
if [ "$SSL" = 'yes' ]; then
298292

@@ -309,15 +303,16 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
309303
done
310304
fi
311305
fi
312-
306+
313307
# Merging web.conf keys
314308
str="DOMAIN='$domain' IP='$IP' IP6='$IP6' ALIAS='$ALIAS'"
315309
str="$str CUSTOM_DOCROOT='$CUSTOM_DOCROOT' CUSTOM_PHPROOT='$CUSTOM_PHPROOT'"
316310
str="$str REDIRECT='$REDIRECT' REDIRECT_CODE='$REDIRECT_CODE'"
317311
str="$str FASTCGI_CACHE='$FASTCGI_CACHE' FASTCGI_DURATION='$FASTCGI_DURATION'"
318312
str="$str TPL='$TPL' SSL='$SSL' SSL_HOME='$SSL_HOME'"
319313
str="$str LETSENCRYPT='$LETSENCRYPT' FTP_USER='$FTP_USER'"
320-
str="$str FTP_MD5='$FTP_MD5' BACKEND='$BACKEND' PROXY='$PROXY'"
314+
str="$str FTP_MD5='$FTP_MD5' FTP_PATH='$FTP_PATH'"
315+
str="$str BACKEND='$BACKEND' PROXY='$PROXY'"
321316
str="$str PROXY_EXT='$PROXY_EXT' STATS='$STATS'"
322317
str="$str STATS_USER='$STATS_USER' STATS_CRYPT='$STATS_CRYPT'"
323318
str="$str U_DISK='$U_DISK' U_BANDWIDTH='0' SUSPENDED='no'"
@@ -328,11 +323,11 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
328323
if [ ! -z "$WEB_BACKEND" ]; then
329324
$BIN/v-add-web-domain-backend $user $domain $BACKEND
330325
fi
331-
332-
# Rebuilding vhost
333-
rebuild_web_domain_conf
334326
fi
335-
327+
328+
# Rebuilding vhost
329+
rebuild_web_domain_conf
330+
336331
# Restoring web domain data
337332
if [ -d "$HOMEDIR/$user/web/$domain/public_html" ]; then
338333
rm -rf $HOMEDIR/$user/web/$domain/public_html/*
@@ -365,6 +360,9 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
365360
find $HOMEDIR/$user/web/$domain/ -user $old_uid \
366361
-exec chown -h $user:$user {} \;
367362
fi
363+
364+
# Rebuilding vhost
365+
rebuild_web_domain_conf
368366
done
369367

370368
# Adding user to traffic queue

0 commit comments

Comments
 (0)