Skip to content

Commit fe8b93a

Browse files
ScIT-RaphaelScIT-Raphael
committed
Add checks to verify, that the conf file exists.
1 parent 1c19492 commit fe8b93a

File tree

1 file changed

+75
-62
lines changed

1 file changed

+75
-62
lines changed

‎bin/v-update-user-counters‎

Lines changed: 75 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -102,79 +102,92 @@ for user in $user_list; do
102102

103103
# Checking web system
104104
U_WEB_DOMAINS=0
105-
for domain_str in $(cat $USER_DATA/web.conf) ;do
106-
eval $domain_str
107-
U_DISK_WEB=$((U_DISK_WEB + U_DISK))
108-
U_WEB_DOMAINS=$((U_WEB_DOMAINS + 1))
109-
110-
if [ "$SSL" = 'yes' ]; then
111-
U_WEB_SSL=$((U_WEB_SSL + 1))
112-
fi
113-
if [ "$SUSPENDED" = 'yes' ]; then
114-
SUSPENDED_WEB=$((SUSPENDED_WEB + 1))
115-
fi
116-
if [ ! -z "$ALIAS" ]; then
117-
aliases=$(echo "$ALIAS"|tr ',' '\n'| wc -l)
118-
U_WEB_ALIASES=$((U_WEB_ALIASES + aliases))
119-
fi
120-
BANDWIDTH=$((BANDWIDTH + U_BANDWIDTH))
121-
done
122-
DISK=$((DISK + U_DISK_WEB))
105+
if [ -f $USER_DATA/mail.conf ]; then
106+
for domain_str in $(cat $USER_DATA/web.conf) ;do
107+
eval $domain_str
108+
U_DISK_WEB=$((U_DISK_WEB + U_DISK))
109+
U_WEB_DOMAINS=$((U_WEB_DOMAINS + 1))
110+
111+
if [ "$SSL" = 'yes' ]; then
112+
U_WEB_SSL=$((U_WEB_SSL + 1))
113+
fi
114+
if [ "$SUSPENDED" = 'yes' ]; then
115+
SUSPENDED_WEB=$((SUSPENDED_WEB + 1))
116+
fi
117+
if [ ! -z "$ALIAS" ]; then
118+
aliases=$(echo "$ALIAS"|tr ',' '\n'| wc -l)
119+
U_WEB_ALIASES=$((U_WEB_ALIASES + aliases))
120+
fi
121+
BANDWIDTH=$((BANDWIDTH + U_BANDWIDTH))
122+
done
123+
DISK=$((DISK + U_DISK_WEB))
124+
fi
123125

124126
# Checking dns system
125-
for domain_str in $(cat $USER_DATA/dns.conf); do
126-
eval $domain_str
127-
U_DNS_DOMAINS=$((U_DNS_DOMAINS + 1))
128-
records=$(wc -l $USER_DATA/dns/$DOMAIN.conf| cut -f 1 -d ' ')
129-
U_DNS_RECORDS=$((U_DNS_RECORDS + records))
130-
if [ "$SUSPENDED" = 'yes' ]; then
131-
SUSPENDED_DNS=$((SUSPENDED_DNS + 1))
132-
fi
133-
update_object_value 'dns' 'DOMAIN' "$DOMAIN" '$RECORDS' "$records"
134-
done
127+
if [ -f $USER_DATA/dns.conf ]; then
128+
for domain_str in $(cat $USER_DATA/dns.conf); do
129+
eval $domain_str
130+
U_DNS_DOMAINS=$((U_DNS_DOMAINS + 1))
131+
records=$(wc -l $USER_DATA/dns/$DOMAIN.conf| cut -f 1 -d ' ')
132+
U_DNS_RECORDS=$((U_DNS_RECORDS + records))
133+
if [ "$SUSPENDED" = 'yes' ]; then
134+
SUSPENDED_DNS=$((SUSPENDED_DNS + 1))
135+
fi
136+
update_object_value 'dns' 'DOMAIN' "$DOMAIN" '$RECORDS' "$records"
137+
done
138+
fi
135139

136140
# Checking mail system
137-
for domain_str in $(cat $USER_DATA/mail.conf); do
138-
eval $domain_str
139-
U_DISK_MAIL=$((U_DISK_MAIL + U_DISK))
140-
U_MAIL_DOMAINS=$((U_MAIL_DOMAINS + 1))
141-
accounts=$(wc -l $USER_DATA/mail/$DOMAIN.conf| cut -f 1 -d ' ')
142-
U_MAIL_ACCOUNTS=$((U_MAIL_ACCOUNTS + accounts))
143-
if [ "$DKIM" = 'yes' ]; then
144-
U_MAIL_DKIM=$((U_MAIL_DKIM + 1))
145-
fi
146-
if [ "$SUSPENDED" = 'yes' ]; then
147-
SUSPENDED_MAIL=$((SUSPENDED_MAIL + 1))
148-
fi
149-
update_object_value 'mail' 'DOMAIN' "$DOMAIN" '$ACCOUNTS' "$accounts"
150-
done
151-
DISK=$((DISK + U_DISK_MAIL))
141+
if [ -f $USER_DATA/mail.conf ]; then
142+
for domain_str in $(cat $USER_DATA/mail.conf); do
143+
eval $domain_str
144+
U_DISK_MAIL=$((U_DISK_MAIL + U_DISK))
145+
U_MAIL_DOMAINS=$((U_MAIL_DOMAINS + 1))
146+
accounts=$(wc -l $USER_DATA/mail/$DOMAIN.conf| cut -f 1 -d ' ')
147+
U_MAIL_ACCOUNTS=$((U_MAIL_ACCOUNTS + accounts))
148+
if [ "$DKIM" = 'yes' ]; then
149+
U_MAIL_DKIM=$((U_MAIL_DKIM + 1))
150+
fi
151+
if [ "$SUSPENDED" = 'yes' ]; then
152+
SUSPENDED_MAIL=$((SUSPENDED_MAIL + 1))
153+
fi
154+
update_object_value 'mail' 'DOMAIN' "$DOMAIN" '$ACCOUNTS' "$accounts"
155+
done
156+
DISK=$((DISK + U_DISK_MAIL))
157+
fi
152158

153159
# Checking db system
154-
for db_str in $(cat $USER_DATA/db.conf); do
155-
eval $db_str
156-
U_DISK_DB=$((U_DISK_DB + U_DISK))
157-
U_DATABASES=$((U_DATABASES + 1))
158-
if [ "$SUSPENDED" = 'yes' ]; then
159-
SUSPENDED_DB=$((SUSPENDED_DB + 1))
160-
fi
161-
done
162-
DISK=$((DISK + U_DISK_DB))
160+
if [ -f $USER_DATA/db.conf ]; then
161+
for db_str in $(cat $USER_DATA/db.conf); do
162+
eval $db_str
163+
U_DISK_DB=$((U_DISK_DB + U_DISK))
164+
U_DATABASES=$((U_DATABASES + 1))
165+
if [ "$SUSPENDED" = 'yes' ]; then
166+
SUSPENDED_DB=$((SUSPENDED_DB + 1))
167+
fi
168+
done
169+
DISK=$((DISK + U_DISK_DB))
170+
fi
163171

164172
# Checking cron system
165-
for cron_str in $(cat $USER_DATA/cron.conf);do
166-
eval $cron_str
167-
U_CRON_JOBS=$((U_CRON_JOBS + 1))
168-
if [ "$SUSPENDED" = 'yes' ]; then
169-
SUSPENDED_CRON=$((SUSPENDED_CRON + 1))
170-
fi
171-
done
173+
if [ -f $USER_DATA/cron.conf ]; then
174+
for cron_str in $(cat $USER_DATA/cron.conf);do
175+
eval $cron_str
176+
U_CRON_JOBS=$((U_CRON_JOBS + 1))
177+
if [ "$SUSPENDED" = 'yes' ]; then
178+
SUSPENDED_CRON=$((SUSPENDED_CRON + 1))
179+
fi
180+
done
181+
fi
172182

173183
# Checking backup
174-
for backup_str in $(cat $USER_DATA/backup.conf); do
175-
U_BACKUPS=$((U_BACKUPS +1))
176-
done
184+
if [ -f $USER_DATA/backup.conf ]; then
185+
for backup_str in $(cat $USER_DATA/backup.conf); do
186+
U_BACKUPS=$((U_BACKUPS +1))
187+
done
188+
fi
177189

190+
# Update values
178191
U_DISK=$DISK
179192
U_BANDWIDTH=$BANDWIDTH
180193
update_user_value "$user" '$SUSPENDED_USERS' "$SUSPENDED_USERS"

0 commit comments

Comments
 (0)