Skip to content

Commit 52dc4fb

Browse files
authored
Fix bug with moving web domain (hestiacp#2210)
1 parent 035eb15 commit 52dc4fb

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

func/rebuild.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,15 +383,17 @@ rebuild_web_domain_conf() {
383383
grep "^$position:" |cut -f 2 -d :)
384384
ftp_md5=$(echo $FTP_MD5 | tr ':' '\n' |grep -n '' |\
385385
grep "^$position:" |cut -f 2 -d :)
386-
387386
# rebuild S/FTP users
388387
$BIN/v-delete-web-domain-ftp "$user" "$domain" "$ftp_user"
389-
$BIN/v-add-web-domain-ftp "$user" "$domain" "${ftp_user#*_}" "!xplaceholder$FTP_MD5" "$ftp_path"
390-
388+
# Generate temporary password to add user but update afterwards
389+
temp_password=$(generate_password);
390+
$BIN/v-add-web-domain-ftp "$user" "$domain" "${ftp_user#*_}" "$temp_password" "$ftp_path"
391391
# Updating ftp user password
392392
chmod u+w /etc/shadow
393393
sed -i "s|^$ftp_user:[^:]*:|$ftp_user:$ftp_md5:|" /etc/shadow
394394
chmod u-w /etc/shadow
395+
#Update web.conf for next rebuild or move
396+
update_object_value 'web' 'DOMAIN' "$domain" '$FTP_MD5' "$ftp_md5"
395397
fi
396398
done
397399

0 commit comments

Comments
 (0)