Skip to content

Commit cf77f95

Browse files
committed
[Fix-Backup] Restoring a webdomain would also restore all other subdomains
Fixes: hestiacp#702
1 parent 004ec8a commit cf77f95

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

bin/v-restore-user

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
284284
domains="$backup_domains"
285285
else
286286
echo "$web" |tr ',' '\n' > $tmpdir/selected.txt
287-
domains=$(echo "$backup_domains" |egrep -f $tmpdir/selected.txt)
287+
domains=$(echo "$backup_domains" |egrep -x -f $tmpdir/selected.txt)
288288
fi
289289

290290
# Restoring web domain
@@ -453,7 +453,7 @@ if [ "$dns" != 'no' ] && [ ! -z "$DNS_SYSTEM" ]; then
453453
domains="$backup_domains"
454454
else
455455
echo "$dns" |tr ',' '\n' > $tmpdir/selected.txt
456-
domains=$(echo "$backup_domains" |egrep -f $tmpdir/selected.txt)
456+
domains=$(echo "$backup_domains" |egrep -x -f $tmpdir/selected.txt)
457457
fi
458458

459459
# Restoring DNS domain
@@ -547,7 +547,7 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
547547
domains="$backup_domains"
548548
else
549549
echo "$mail" |tr ',' '\n' > $tmpdir/selected.txt
550-
domains=$(echo "$backup_domains" |egrep -f $tmpdir/selected.txt)
550+
domains=$(echo "$backup_domains" |egrep -x -f $tmpdir/selected.txt)
551551
fi
552552

553553
# Checking exim username for later chowning
@@ -650,7 +650,7 @@ if [ "$db" != 'no' ] && [ ! -z "$DB_SYSTEM" ]; then
650650
databases="$backup_databases"
651651
else
652652
echo "$db" |tr ',' '\n' > $tmpdir/selected.txt
653-
databases=$(echo "$backup_databases" |egrep -f $tmpdir/selected.txt)
653+
databases=$(echo "$backup_databases" |egrep -x -f $tmpdir/selected.txt)
654654
fi
655655

656656
# Restoring database
@@ -761,7 +761,7 @@ if [ "$udir" != 'no' ]; then
761761
user_dirs="$backup_dirs"
762762
else
763763
echo "$udir" |tr ',' '\n' > $tmpdir/selected.txt
764-
user_dirs=$(echo "$backup_dirs" |egrep -f $tmpdir/selected.txt)
764+
user_dirs=$(echo "$backup_dirs" |egrep -x -f $tmpdir/selected.txt)
765765
fi
766766

767767
for user_dir in $user_dirs; do

0 commit comments

Comments
 (0)