Skip to content

Commit 38abf0a

Browse files
authored
Fix: v-add-domain fails with package limit if limits are reached (hestiacp#3119)
For example: User with 0 mail domains and run v-add-domain from api will always return 8 package limit reached
1 parent 3cbd7b3 commit 38abf0a

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

bin/v-add-domain

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,33 @@ fi
5454

5555
# Working on web domain
5656
if [ -n "$WEB_SYSTEM" ]; then
57-
$BIN/v-add-web-domain "$user" "$domain" "$ip" 'no'
58-
check_result $? "can't add web domain" > /dev/null
57+
check1=$(is_package_full 'WEB_DOMAINS')
58+
if [ $? -eq 0 ]; then
59+
$BIN/v-add-web-domain "$user" "$domain" "$ip" 'no'
60+
check_result $? "can't add web domain"
61+
fi
5962
fi
6063

6164
# Working on DNS domain
6265
if [ -n "$DNS_SYSTEM" ]; then
63-
$BIN/v-add-dns-domain "$user" "$domain" "$ip" "" "" "" "" "" "" "" "" "no"
64-
check_result $? "can't add dns domain" > /dev/null
66+
check2=$(is_package_full 'DNS_DOMAINS')
67+
if [ $? -eq 0 ]; then
68+
$BIN/v-add-dns-domain "$user" "$domain" "$ip" "" "" "" "" "" "" "" "" "no"
69+
check_result $? "can't add dns domain"
70+
fi
6571
fi
6672

6773
# Working on mail domain
6874
if [ -n "$MAIL_SYSTEM" ]; then
69-
$BIN/v-add-mail-domain $user $domain 'no'
70-
check_result $? "can't add mail domain" > /dev/null
75+
check3=$(is_package_full 'MAIL_DOMAINS')
76+
if [ $? -eq 0 ]; then
77+
$BIN/v-add-mail-domain $user $domain 'no'
78+
check_result $? "can't add mail domain"
79+
fi
80+
fi
81+
82+
if [[ "$check1" != '' && "$check2" != '' && "$check3" != '' ]]; then
83+
check_result 8 "Package limit reached"
7184
fi
7285

7386
# Restarting services

0 commit comments

Comments
 (0)