Add checks to verify, that the conf file exists.

bin/v-update-user-counters

@@ -102,79 +102,92 @@ for user in $user_list; do
 
     # Checking web system
     U_WEB_DOMAINS=0
-    for domain_str in $(cat $USER_DATA/web.conf) ;do
-        eval $domain_str
-        U_DISK_WEB=$((U_DISK_WEB + U_DISK))
-        U_WEB_DOMAINS=$((U_WEB_DOMAINS + 1))
-
-        if [ "$SSL" = 'yes' ]; then
-            U_WEB_SSL=$((U_WEB_SSL + 1))
-        fi
-        if [ "$SUSPENDED" = 'yes' ]; then
-            SUSPENDED_WEB=$((SUSPENDED_WEB + 1))
-        fi
-        if [ ! -z "$ALIAS" ]; then
-            aliases=$(echo "$ALIAS"|tr ',' '\n'| wc -l)
-            U_WEB_ALIASES=$((U_WEB_ALIASES + aliases))
-        fi
-        BANDWIDTH=$((BANDWIDTH + U_BANDWIDTH))
-    done
-    DISK=$((DISK + U_DISK_WEB))
+    if [ -f $USER_DATA/mail.conf ]; then
+        for domain_str in $(cat $USER_DATA/web.conf) ;do
+            eval $domain_str
+            U_DISK_WEB=$((U_DISK_WEB + U_DISK))
+            U_WEB_DOMAINS=$((U_WEB_DOMAINS + 1))
+
+            if [ "$SSL" = 'yes' ]; then
+                U_WEB_SSL=$((U_WEB_SSL + 1))
+            fi
+            if [ "$SUSPENDED" = 'yes' ]; then
+                SUSPENDED_WEB=$((SUSPENDED_WEB + 1))
+            fi
+            if [ ! -z "$ALIAS" ]; then
+                aliases=$(echo "$ALIAS"|tr ',' '\n'| wc -l)
+                U_WEB_ALIASES=$((U_WEB_ALIASES + aliases))
+            fi
+            BANDWIDTH=$((BANDWIDTH + U_BANDWIDTH))
+        done
+        DISK=$((DISK + U_DISK_WEB))
+    fi
 
     # Checking dns system
-    for domain_str in $(cat $USER_DATA/dns.conf); do
-        eval $domain_str
-        U_DNS_DOMAINS=$((U_DNS_DOMAINS + 1))
-        records=$(wc -l $USER_DATA/dns/$DOMAIN.conf| cut -f 1 -d ' ')
-        U_DNS_RECORDS=$((U_DNS_RECORDS + records))
-        if [ "$SUSPENDED" = 'yes' ]; then
-            SUSPENDED_DNS=$((SUSPENDED_DNS + 1))
-        fi
-        update_object_value 'dns' 'DOMAIN' "$DOMAIN" '$RECORDS' "$records"
-    done
+    if [ -f $USER_DATA/dns.conf ]; then
+        for domain_str in $(cat $USER_DATA/dns.conf); do
+            eval $domain_str
+            U_DNS_DOMAINS=$((U_DNS_DOMAINS + 1))
+            records=$(wc -l $USER_DATA/dns/$DOMAIN.conf| cut -f 1 -d ' ')
+            U_DNS_RECORDS=$((U_DNS_RECORDS + records))
+            if [ "$SUSPENDED" = 'yes' ]; then
+                SUSPENDED_DNS=$((SUSPENDED_DNS + 1))
+            fi
+            update_object_value 'dns' 'DOMAIN' "$DOMAIN" '$RECORDS' "$records"
+        done
+    fi
 
     # Checking mail system
-    for domain_str in $(cat $USER_DATA/mail.conf); do
-        eval $domain_str
-        U_DISK_MAIL=$((U_DISK_MAIL + U_DISK))
-        U_MAIL_DOMAINS=$((U_MAIL_DOMAINS + 1))
-        accounts=$(wc -l $USER_DATA/mail/$DOMAIN.conf| cut -f 1 -d ' ')
-        U_MAIL_ACCOUNTS=$((U_MAIL_ACCOUNTS + accounts))
-        if [ "$DKIM" = 'yes' ]; then
-            U_MAIL_DKIM=$((U_MAIL_DKIM + 1))
-        fi
-        if [ "$SUSPENDED" = 'yes' ]; then
-            SUSPENDED_MAIL=$((SUSPENDED_MAIL + 1))
-        fi
-        update_object_value 'mail' 'DOMAIN' "$DOMAIN" '$ACCOUNTS' "$accounts"
-    done
-    DISK=$((DISK + U_DISK_MAIL))
+    if [ -f $USER_DATA/mail.conf ]; then
+        for domain_str in $(cat $USER_DATA/mail.conf); do
+            eval $domain_str
+            U_DISK_MAIL=$((U_DISK_MAIL + U_DISK))
+            U_MAIL_DOMAINS=$((U_MAIL_DOMAINS + 1))
+            accounts=$(wc -l $USER_DATA/mail/$DOMAIN.conf| cut -f 1 -d ' ')
+            U_MAIL_ACCOUNTS=$((U_MAIL_ACCOUNTS + accounts))
+            if [ "$DKIM" = 'yes' ]; then
+                U_MAIL_DKIM=$((U_MAIL_DKIM + 1))
+            fi
+            if [ "$SUSPENDED" = 'yes' ]; then
+                SUSPENDED_MAIL=$((SUSPENDED_MAIL + 1))
+            fi
+            update_object_value 'mail' 'DOMAIN' "$DOMAIN" '$ACCOUNTS' "$accounts"
+        done
+        DISK=$((DISK + U_DISK_MAIL))
+    fi
 
     # Checking db system
-    for db_str in $(cat $USER_DATA/db.conf); do
-        eval $db_str
-        U_DISK_DB=$((U_DISK_DB + U_DISK))
-        U_DATABASES=$((U_DATABASES + 1))
-        if [ "$SUSPENDED" = 'yes' ]; then
-            SUSPENDED_DB=$((SUSPENDED_DB + 1))
-        fi
-    done
-    DISK=$((DISK + U_DISK_DB))
+    if [ -f $USER_DATA/db.conf ]; then
+        for db_str in $(cat $USER_DATA/db.conf); do
+            eval $db_str
+            U_DISK_DB=$((U_DISK_DB + U_DISK))
+            U_DATABASES=$((U_DATABASES + 1))
+            if [ "$SUSPENDED" = 'yes' ]; then
+                SUSPENDED_DB=$((SUSPENDED_DB + 1))
+            fi
+        done
+        DISK=$((DISK + U_DISK_DB))
+    fi
 
     # Checking cron system
-    for cron_str in $(cat $USER_DATA/cron.conf);do
-        eval $cron_str
-        U_CRON_JOBS=$((U_CRON_JOBS + 1))
-        if [ "$SUSPENDED" = 'yes' ]; then
-            SUSPENDED_CRON=$((SUSPENDED_CRON + 1))
-        fi
-    done
+    if [ -f $USER_DATA/cron.conf ]; then
+        for cron_str in $(cat $USER_DATA/cron.conf);do
+            eval $cron_str
+            U_CRON_JOBS=$((U_CRON_JOBS + 1))
+            if [ "$SUSPENDED" = 'yes' ]; then
+                SUSPENDED_CRON=$((SUSPENDED_CRON + 1))
+            fi
+        done
+    fi
 
     # Checking backup
-    for backup_str in $(cat $USER_DATA/backup.conf); do
-        U_BACKUPS=$((U_BACKUPS +1))
-    done
+    if [ -f $USER_DATA/backup.conf ]; then
+        for backup_str in $(cat $USER_DATA/backup.conf); do
+            U_BACKUPS=$((U_BACKUPS +1))
+        done
+    fi
 
+    # Update values
     U_DISK=$DISK
     U_BANDWIDTH=$BANDWIDTH
     update_user_value "$user" '$SUSPENDED_USERS' "$SUSPENDED_USERS"