github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 21:34:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

added U_BACKUPS counter

Browse source
This commit is contained in:
Serghey Rodin 2012-02-26 12:39:37 +02:00
commit 4134cc38bc
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bin/v_add_user
View file

@ -205,6 +205,7 @@ U_MAIL_DOMAINS='0'
U_MAIL_ACCOUNTS='0'
U_DATABASES='0'
U_CRON_JOBS='0'
U_BACKUPS='0'
DATE='$V_DATE'" > $V_USERS/$user/user.conf
chmod 660 $V_USERS/$user/user.conf

15
bin/v_change_user_package
View file

@ -41,13 +41,13 @@ is_package_avalable() {
done
# Comparing user data with package
if [ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ] ||\
[ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ] ||\
[ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ] ||\
[ "$DATABASES" -lt "$U_DATABASES" ] ||\
[ "$CRON_JOBS" -lt "$U_CRON_JOBS" ] ||\
[ "$DISK_QUOTA" -lt "$U_DISK" ] ||\
[ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]; then
if [[ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ]] ||\
[[ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ]] ||\
[[ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ]] ||\
[[ "$DATABASES" -lt "$U_DATABASES" ]] ||\
[[ "$CRON_JOBS" -lt "$U_CRON_JOBS" ]] ||\
[[ "$DISK_QUOTA" -lt "$U_DISK" ]] ||\
[[ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
@ -108,6 +108,7 @@ U_MAIL_DOMAINS='$U_MAIL_DOMAINS'
U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS'
U_DATABASES='$U_DATABASES'
U_CRON_JOBS='$U_CRON_JOBS'
U_BACKUPS='$U_BACKUPS'
DATE='$DATE'" > $V_USERS/$user/user.conf
}

3
bin/v_list_user
View file

@ -94,7 +94,8 @@ fields='$USER $FNAME $LNAME $PACKAGE $WEB_DOMAINS $WEB_ALIASES $WEB_TPL
$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 $DATE'
$U_MAIL_DOMAINS $U_MAIL_ACCOUNTS $U_DATABASES $U_CRON_JOBS $U_BACKUPS
$DATE'
# Listing user
case $format in

2
bin/v_list_users
View file

@ -92,7 +92,7 @@ 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 \$DATE"
fields="$fields \$U_BACKUPS \$DATE"
# Listing domains
case $format in

3
bin/v_update_user_counters
View file

@ -78,6 +78,7 @@ for user in $user_list; do
U_MAIL_ACCOUNTS=0
U_DATABASES=0
U_CRON_JOBS=0
U_BACKUPS=0
# New IFS
IFS=$'\n'
@ -185,7 +186,7 @@ for user in $user_list; do
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"
update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS"
done