Skip to content

Commit d85b468

Browse files
committed
added counters in domain rebuild functions
1 parent 54b319c commit d85b468

File tree

3 files changed

+31
-10
lines changed

3 files changed

+31
-10
lines changed

bin/v_rebuild_dns_domains

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ is_user_suspended
4444
# Action #
4545
#----------------------------------------------------------#
4646

47+
user_domains=0
4748
user_records=0
4849
suspended_dns=0
4950

@@ -77,18 +78,13 @@ done
7778
for domain in $domains; do
7879

7980
# Defining variables
81+
get_domain_values 'dns'
8082
domain_idn=$(idn -t --quiet -a "$domain")
81-
ip="$(get_domain_value 'dns' '$IP')"
82-
template="$(get_domain_value 'dns' '$TPL')"
83-
exp="$(get_domain_value 'dns' '$EXP')"
84-
soa="$(get_domain_value 'dns' '$SOA')"
85-
ttl="$(get_domain_value 'dns' '$TTL')"
86-
suspended="$(get_domain_value 'dns' '$SUSPENDED')"
8783

8884
# Checking zone file
8985
if [ ! -e "$V_USERS/$user/dns/$domain" ]; then
90-
cat $V_DNSTPL/$template.tpl |\
91-
sed -e "s/%ip%/$ip/g" \
86+
cat $V_DNSTPL/$TPL.tpl |\
87+
sed -e "s/%ip%/$IP/g" \
9288
-e "s/%domain_idn%/$domain_idn/g" \
9389
-e "s/%domain%/$domain/g" \
9490
-e "s/%ns1%/$ns1/g" \
@@ -115,7 +111,7 @@ for domain in $domains; do
115111
# Bind config check
116112
nconf='/etc/named.conf'
117113

118-
if [ "$suspended" = 'yes' ]; then
114+
if [ "$SUSPENDED" = 'yes' ]; then
119115
rm_string=$(grep -n /etc/namedb/$domain.db $nconf | cut -d : -f 1)
120116
if [ ! -z "$rm_string" ]; then
121117
sed -i "$rm_string d" $nconf
@@ -128,6 +124,7 @@ for domain in $domains; do
128124
echo "$named" >> /etc/named.conf
129125
fi
130126
fi
127+
user_domains=$((user_domains + 1))
131128
records=$(wc -l $V_USERS/$user/dns/$domain | cut -f 1 -d ' ')
132129
user_records=$((user_records + records))
133130
update_domain_value 'dns' '$RECORDS' "$records"
@@ -139,6 +136,7 @@ done
139136
#----------------------------------------------------------#
140137

141138
# Updating counters
139+
update_user_value "$user" '$U_DNS_DOMAINS' "$user_domains"
142140
update_user_value "$user" '$U_DNS_RECORDS' "$user_records"
143141
update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
144142

bin/v_rebuild_web_domains

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ is_user_suspended
4545
# Action #
4646
#----------------------------------------------------------#
4747

48+
user_domains=0
49+
user_ssl=0
50+
user_aliases=0
51+
suspended_web=0
52+
4853
# Clean up old config
4954
rm -f $V_HOME/$user/conf/tmp_*.conf
5055

@@ -75,6 +80,12 @@ for domain in $(shell_list) ; do
7580
$V_WEBTPL/apache_$TPL.sh $user $domain $ip $V_HOME $docroot
7681
fi
7782

83+
# Checking aliases
84+
if [ ! -z "$ALIAS" ]; then
85+
aliases=$(echo "$ALIAS"|tr ',' '\n'| wc -l)
86+
user_aliases=$((user_aliases + aliases))
87+
fi
88+
7889
# Checking stats
7990
if [ ! -z "$STATS" ]; then
8091
cat $V_WEBTPL/$STATS.tpl |\
@@ -123,6 +134,7 @@ for domain in $(shell_list) ; do
123134
$V_WEBTPL/apache_$TPL.sh $user $domain $ip $V_HOME $docroot
124135
fi
125136

137+
user_ssl=$((user_ssl + 1))
126138
ssl_change='yes'
127139
fi
128140

@@ -149,6 +161,10 @@ for domain in $(shell_list) ; do
149161
fi
150162
ngix_change='yes'
151163
fi
164+
if [ "$SUSPENDED" = 'yes' ]; then
165+
suspended_web=$((suspended_web + 1))
166+
fi
167+
user_domains=$((user_domains + 1))
152168
done
153169

154170
# Renaming tmp config
@@ -206,6 +222,12 @@ fi
206222
# Vesta #
207223
#----------------------------------------------------------#
208224

225+
# Updating counters
226+
update_user_value "$user" '$SUSPENDED_WEB' "$suspended_web"
227+
update_user_value "$user" '$U_WEB_DOMAINS' "$user_domains"
228+
update_user_value "$user" '$U_WEB_SSL' "$user_ssl"
229+
update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases"
230+
209231
# Adding task to the vesta pipe
210232
restart_schedule 'web'
211233

bin/v_update_user_counters

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,12 @@ for user in $user_list; do
104104
fi
105105

106106
# Checking web system
107+
U_WEB_DOMAINS=0
107108
for domain_str in $(cat $V_USERS/$user/web.conf) ;do
108109
eval $domain_str
109110
U_DISK_WEB=$((U_DISK_WEB + U_DISK))
110111
U_WEB_DOMAINS=$((U_WEB_DOMAINS + 1))
112+
111113
if [ "$SSL" = 'yes' ]; then
112114
U_WEB_SSL=$((U_WEB_SSL + 1))
113115
fi
@@ -116,7 +118,6 @@ for user in $user_list; do
116118
fi
117119
if [ ! -z "$ALIAS" ]; then
118120
aliases=$(echo "$ALIAS"|tr ',' '\n'| wc -l)
119-
aliases=$((aliases + 1))
120121
U_WEB_ALIASES=$((U_WEB_ALIASES + aliases))
121122
fi
122123
BANDWIDTH=$((BANDWIDTH + U_BANDWIDTH))

0 commit comments

Comments
 (0)