From 20f200fbff554fb7c3baa576b2448341909b2d29 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 6 Apr 2012 23:33:17 +0300 Subject: [PATCH] added U_MAIL_DKIM counter --- bin/v_add_mail_domain | 3 +++ bin/v_add_mail_domain_dkim | 1 + bin/v_add_user | 1 + bin/v_delete_mail_domain | 4 ++++ bin/v_delete_mail_domain_dkim | 1 + bin/v_list_user | 6 +++--- bin/v_list_users | 4 ++-- bin/v_rebuild_mail_domains | 12 ++++++++---- bin/v_update_user_counters | 15 +++++++++++++++ 9 files changed, 38 insertions(+), 9 deletions(-) diff --git a/bin/v_add_mail_domain b/bin/v_add_mail_domain index 3056e4b7..2fa7cff4 100755 --- a/bin/v_add_mail_domain +++ b/bin/v_add_mail_domain @@ -109,6 +109,9 @@ chmod 660 $USER_DATA/mail/$domain.conf # Increasing domain value increase_user_value "$user" '$U_MAIL_DOMAINS' +if [ "$dkim" = 'yes' ]; then + increase_user_value "$user" '$U_MAIL_DKMI' +fi # Logging log_history "$EVENT" diff --git a/bin/v_add_mail_domain_dkim b/bin/v_add_mail_domain_dkim index 97d55ac5..d63a2bd9 100755 --- a/bin/v_add_mail_domain_dkim +++ b/bin/v_add_mail_domain_dkim @@ -72,6 +72,7 @@ fi # Adding dkim in config update_object_value 'mail' 'DOMAIN' "$domain" '$DKIM' 'yes' +increase_user_value "$user" '$U_MAIL_DKMI' # Logging log_history "$EVENT" diff --git a/bin/v_add_user b/bin/v_add_user index 2d374460..caf3d5cf 100755 --- a/bin/v_add_user +++ b/bin/v_add_user @@ -191,6 +191,7 @@ U_WEB_ALIASES='0' U_DNS_DOMAINS='0' U_DNS_RECORDS='0' U_MAIL_DOMAINS='0' +U_MAIL_DKIM='0' U_MAIL_ACCOUNTS='0' U_DATABASES='0' U_CRON_JOBS='0' diff --git a/bin/v_delete_mail_domain b/bin/v_delete_mail_domain index 6fe75d59..a768e1a0 100755 --- a/bin/v_delete_mail_domain +++ b/bin/v_delete_mail_domain @@ -59,8 +59,12 @@ rm -f $USER_DATA/mail/*@$domain.msg # Decreasing domain value decrease_user_value "$user" '$U_MAIL_DOMAINS' +if [ "$DKIM" = 'yes' ]; then + decrease_user_value "$user" '$U_MAIL_DKMI' +fi decrease_user_value "$user" '$U_MAIL_ACCOUNTS' "$accounts" + # Logging log_history "$EVENT" log_event "$OK" "$EVENT" diff --git a/bin/v_delete_mail_domain_dkim b/bin/v_delete_mail_domain_dkim index e35b23e5..833fdec3 100755 --- a/bin/v_delete_mail_domain_dkim +++ b/bin/v_delete_mail_domain_dkim @@ -60,6 +60,7 @@ fi # Updatoing config update_object_value 'mail' 'DOMAIN' "$domain" '$DKIM' 'no' +decrease_user_value "$user" '$U_MAIL_DKMI' # Logging log_history "$EVENT" diff --git a/bin/v_list_user b/bin/v_list_user index 6142d085..646cf7d1 100755 --- a/bin/v_list_user +++ b/bin/v_list_user @@ -72,15 +72,15 @@ is_object_valid 'user' 'USER' "$user" conf=$USER_DATA/user.conf # Defining fileds to select -fields='$USER $FNAME $LNAME $PACKAGE $WEB_DOMAINS $WEB_ALIASES $WEB_TPL +fields='$USER $FNAME $LNAME $PACKAGE $WEB_DOMAINS $WEB_ALIASES $WEB_TPL $DNS_DOMAINS $DNS_RECORDS $MAIL_DOMAINS $MAIL_ACCOUNTS $DATABASES $CRON_JOBS $DISK_QUOTA $BANDWIDTH $NS $SHELL $BACKUPS $CONTACT $CRON_REPORTS $RKEY $SUSPENDED $SUSPENDED_USERS $SUSPENDED_WEB $SUSPENDED_DNS $SUSPENDED_MAIL $SUSPENDED_DB $SUSPENDED_CRON $IP_AVAIL $IP_OWNED $U_USERS $U_DISK $U_DISK_DIRS $U_DISK_WEB $U_DISK_MAIL $U_DISK_DB $U_BANDWIDTH $U_WEB_DOMAINS $U_WEB_SSL $U_WEB_ALIASES $U_DNS_DOMAINS - $U_DNS_RECORDS $U_MAIL_DOMAINS $U_MAIL_ACCOUNTS $U_DATABASES $U_CRON_JOBS - $U_BACKUPS $TIME $DATE' + $U_DNS_RECORDS $U_MAIL_DOMAINS $U_MAIL_DKIM $U_MAIL_ACCOUNTS $U_DATABASES + $U_CRON_JOBS $U_BACKUPS $TIME $DATE' # Listing user case $format in diff --git a/bin/v_list_users b/bin/v_list_users index dd9d37cd..d85be740 100755 --- a/bin/v_list_users +++ b/bin/v_list_users @@ -82,8 +82,8 @@ fields="$fields \$SUSPENDED_MAIL \$SUSPENDED_DB \$SUSPENDED_CRON \$IP_AVAIL" fields="$fields \$IP_OWNED \$U_USERS \$U_DISK \$U_DISK_DIRS \$U_DISK_WEB" fields="$fields \$U_DISK_MAIL \$U_DISK_DB \$U_BANDWIDTH \$U_WEB_DOMAINS" fields="$fields \$U_WEB_SSL \$U_WEB_ALIASES \$U_DNS_DOMAINS \$U_DNS_RECORDS" -fields="$fields \$U_MAIL_DOMAINS \$U_MAIL_ACCOUNTS \$U_DATABASES \$U_CRON_JOBS" -fields="$fields \$U_BACKUPS \$TIME \$DATE" +fields="$fields \$U_MAIL_DOMAINS \$U_MAIL_DKIM \$U_MAIL_ACCOUNTS \$U_DATABASES" +fields="$fields \$U_CRON_JOBS \$U_BACKUPS \$TIME \$DATE" # Listing domains case $format in diff --git a/bin/v_rebuild_mail_domains b/bin/v_rebuild_mail_domains index b6d8add3..e943ccf3 100755 --- a/bin/v_rebuild_mail_domains +++ b/bin/v_rebuild_mail_domains @@ -34,10 +34,11 @@ is_object_unsuspended 'user' 'USER' "$user" #----------------------------------------------------------# # Reset counters -U_MAIL_DOMAINS='0' -U_MAIL_ACCOUNTS='0' -SUSPENDED_MAIL='0' -U_DISK_MAIL='0' +U_MAIL_DOMAINS=0 +U_MAIL_DKMI=0 +U_MAIL_ACCOUNTS=0 +SUSPENDED_MAIL=0 +U_DISK_MAIL=0 # Checking mail folder if [ ! -d "$USER_DATA/mail" ]; then @@ -78,6 +79,7 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do # Adding dkim if [ "$DKIM" = 'yes' ]; then + U_MAIL_DKMI=$((U_MAIL_DKMI + 1)) pem="$USER_DATA/mail/$domain.pem" pub="$USER_DATA/mail/$domain.pub" openssl genrsa -out $pem 512 &>/dev/null @@ -169,9 +171,11 @@ done # Updating counters update_user_value "$user" '$U_MAIL_DOMAINS' "$U_MAIL_DOMAINS" +update_user_value "$user" '$U_MAIL_DKMI' "$U_MAIL_DKMI" update_user_value "$user" '$U_MAIL_ACCOUNTS' "$U_MAIL_ACCOUNTS" update_user_value "$user" '$SUSPENDED_MAIL' "$SUSPENDED_MAIL" update_user_value "$user" '$U_DISK_MAIL' "$U_DISK_MAIL" + recalc_user_disk_usage # Logging diff --git a/bin/v_update_user_counters b/bin/v_update_user_counters index 34b3ade4..634eced8 100755 --- a/bin/v_update_user_counters +++ b/bin/v_update_user_counters @@ -69,6 +69,7 @@ for user in $user_list; do U_DNS_DOMAINS=0 U_DNS_RECORDS=0 U_MAIL_DOMAINS=0 + U_MAIL_DKMI=0 U_MAIL_ACCOUNTS=0 U_DATABASES=0 U_CRON_JOBS=0 @@ -132,6 +133,19 @@ for user in $user_list; do done # 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 + done SUSPENDED_MAIL=0 DISK=$((DISK + U_DISK_MAIL)) @@ -178,6 +192,7 @@ for user in $user_list; do update_user_value "$user" '$U_DNS_DOMAINS' "$U_DNS_DOMAINS" update_user_value "$user" '$U_DNS_RECORDS' "$U_DNS_RECORDS" update_user_value "$user" '$U_MAIL_DOMAINS' "$U_MAIL_DOMAINS" + update_user_value "$user" '$U_MAIL_DKIM' "$U_MAIL_DKIM" update_user_value "$user" '$U_MAIL_ACCOUNTS' "$U_MAIL_ACCOUNTS" update_user_value "$user" '$U_DATABASES' "$U_DATABASES" update_user_value "$user" '$U_CRON_JOBS' "$U_CRON_JOBS"