github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 13:01:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

database Keys redesing

Browse source
This commit is contained in:
Serghey Rodin 2012-02-16 01:25:03 +02:00
commit 444137f225
49 changed files with 202 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v_add_cron_job
View file

@ -62,7 +62,7 @@ is_cron_job_free
# Concatenating cron string
command=$(echo $command|sed -e "s/'/%quote%/g" -e "s/:/%dots%/g")
v_str="JOB='$job' MIN='$min' HOUR='$hour' DAY='$day' MONTH='$month"
v_str="$v_str' WDAY='$wday' CMD='$command' SUSPEND='no' DATE='$V_DATE'"
v_str="$v_str' WDAY='$wday' CMD='$command' SUSPENDED='no' DATE='$V_DATE'"
# Adding to crontab
echo "$v_str">>$V_USERS/$user/cron.conf

2
bin/v_add_db_base
View file

@ -89,7 +89,7 @@ increase_user_value "$user" '$U_DATABASES'
# Adding db to db conf
v_str="DB='$database' USER='$db_user' HOST='$host' TYPE='$type'"
v_str="$v_str CHARSET='$encoding' U_DISK='0' SUSPEND='no' DATE='$V_DATE'"
v_str="$v_str CHARSET='$encoding' U_DISK='0' SUSPENDED='no' DATE='$V_DATE'"
echo "$v_str" >> $V_USERS/$user/db.conf
chmod 660 $V_USERS/$user/db.conf

2
bin/v_add_dns_domain
View file

@ -102,7 +102,7 @@ cat $V_DNSTPL/$template.tpl |\
# Adding dns.conf record
dns_rec="DOMAIN='$domain' IP='$ip' TPL='$template' TTL='$ttl' EXP='$exp'"
dns_rec="$dns_rec SOA='$soa' SUSPEND='no' DATE='$V_DATE'"
dns_rec="$dns_rec SOA='$soa' SUSPENDED='no' DATE='$V_DATE'"
echo "$dns_rec" >> $V_USERS/$user/dns.conf
chmod 660 $V_USERS/$user/dns.conf

2
bin/v_add_dns_domain_record
View file

@ -77,7 +77,7 @@ zone="$V_USERS/$user/dns/$domain"
# Adding record
dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' VALUE='$dvalue'"
dns_rec="$dns_rec SUSPEND='no' DATE='$V_DATE'"
dns_rec="$dns_rec SUSPENDED='no' DATE='$V_DATE'"
echo "$dns_rec" >> $zone
# Sorting records

2
bin/v_add_mail_domain
View file

@ -92,7 +92,7 @@ cat $V_DNSTPL/$template.tpl |\
# Adding dns.conf record
dns_rec="DOMAIN='$domain' IP='$ip' TPL='$template' TTL='$ttl' EXP='$exp'"
dns_rec="$dns_rec SOA='$soa' SUSPEND='no' DATE='$V_DATE'"
dns_rec="$dns_rec SOA='$soa' SUSPENDED='no' DATE='$V_DATE'"
echo "$dns_rec" >> $V_USERS/$user/dns.conf
chmod 660 $V_USERS/$user/dns.conf

13
bin/v_add_user
View file

@ -169,19 +169,28 @@ echo "FNAME='$fname'
LNAME='$lname'
PACKAGE='$package'
$package_data
SUSPENDED='no'
CONTACT='$email'
REPORTS='yes'
RKEY='$(gen_password)'
SUSPENDED='no'
SUSPENDED_USERS='0'
SUSPENDED_WEB='0'
SUSPENDED_DNS='0'
SUSPENDED_MAIL='0'
SUSPENDED_DB='0'
SUSPENDED_CRON='0'
IP_OWNED='0'
U_DIR_DISK='0'
U_DISK='0'
U_BANDWIDTH='0'
U_WEB_DOMAINS='0'
U_WEB_SSL='0'
U_WEB_ALIASES='0'
U_DNS_DOMAINS='0'
U_DATABASES='0'
U_DNS_RECORDS='0'
U_MAIL_DOMAINS='0'
U_MAIL_ACCOUNTS='0'
U_DATABASES='0'
U_CRON_JOBS='0'
DATE='$V_DATE'" > $V_USERS/$user/user.conf
chmod 660 $V_USERS/$user/user.conf

2
bin/v_add_web_domain
View file

@ -218,7 +218,7 @@ v_str="$v_str ALIAS='$aliases'"
v_str="$v_str $template_data" # Inserting PHP, CGI and ELOG keys
v_str="$v_str STATS='' STATS_AUTH=''"
v_str="$v_str SSL='no' SSL_HOME='single'"
v_str="$v_str NGINX='' NGINX_EXT='' SUSPEND='no' DATE='$V_DATE'"
v_str="$v_str NGINX='' NGINX_EXT='' SUSPENDED='no' DATE='$V_DATE'"
# Registering domain
echo "$v_str" >> $V_USERS/$user/web.conf

2
bin/v_change_cron_job
View file

@ -59,7 +59,7 @@ is_job_valid
# Concatenating cron string
command=$(echo $command|sed -e "s/'/%quote%/g" -e "s/:/%dots%/g")
v_str="JOB='$job' MIN='$min' HOUR='$hour' WDAY='$wday'"
v_str="$v_str MONTH='$month' DAY='$day' CMD='$command' SUSPEND='no'"
v_str="$v_str MONTH='$month' DAY='$day' CMD='$command' SUSPENDED='no'"
# Deleting job
del_cron_job

2
bin/v_change_dns_domain_record
View file

@ -68,7 +68,7 @@ fi
# Adding record
dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' VALUE='$value'"
dns_rec="$dns_rec SUSPEND='no' DATE='$V_DATE'"
dns_rec="$dns_rec SUSPENDED='no' DATE='$V_DATE'"
echo "$dns_rec" >> $zone
# Sorting records

44
bin/v_change_user_package
View file

@ -21,17 +21,15 @@ source $V_FUNC/shared.func
is_package_avalable() {
# Parsing user data
usr_data=$(cat $V_USERS/$user/user.conf)
IFS=$'\n'
for key in $usr_data; do
eval ${key%%=*}=${key#*=}
done
# Clearing vars
WEB_DOMAINS='0'
WEB_SSL='0'
DATABASES='0'
MAIL_DOMAINS='0'
MAIL_BOXES='0'
MAIL_FORWARDERS='0'
DNS_DOMAINS='0'
DISK_QUOTA='0'
BANDWIDTH='0'
@ -44,10 +42,10 @@ is_package_avalable() {
# Comparing user data with package
if [ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ] ||\
[ "$WEB_SSL" -lt "$U_WEB_SSL" ] ||\
[ "$DATABASES" -lt "$U_DATABASES" ] ||\
[ "$MAIL_DOMAINS" -lt "$U_MAIL_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"
@ -59,6 +57,7 @@ is_package_avalable() {
change_user_package() {
# Parsing user data
usr_data=$(cat $V_USERS/$user/user.conf)
IFS=$'\n'
for key in $usr_data; do
eval ${key%%=*}=${key#*=}
done
@ -73,32 +72,41 @@ change_user_package() {
LNAME='$LNAME'
PACKAGE='$package'
WEB_DOMAINS='$WEB_DOMAINS'
WEB_SSL='$WEB_SSL'
WEB_ALIASES='$WEB_ALIASES'
DATABASES='$DATABASES'
MAIL_DOMAINS='$MAIL_DOMAINS'
MAIL_BOXES='$MAIL_BOXES'
MAIL_FORWARDERS='$MAIL_FORWARDERS'
WEB_TPL='$WEB_TPL'
DNS_DOMAINS='$DNS_DOMAINS'
DNS_RECORDS='$DNS_RECORDS'
MAIL_DOMAINS='$MAIL_DOMAINS'
MAIL_ACCOUNTS='$MAIL_ACCOUNTS'
DATABASES='$DATABASES'
CRON_JOBS='$CRON_JOBS'
DISK_QUOTA='$DISK_QUOTA'
BANDWIDTH='$BANDWIDTH'
NS='$NS'
SHELL='$SHELL'
BACKUPS='$BACKUPS'
WEB_TPL='$WEB_TPL'
SUSPENDED='$SUSPENDED'
CONTACT='$CONTACT'
RKEY='$RKEY'
REPORTS='$REPORTS'
RKEY='$RKEY'
SUSPENDED='$SUSPENDED'
SUSPENDED_USERS='$SUSPENDED_USERS'
SUSPENDED_WEB='$SUSPENDED_WEB'
SUSPENDED_DNS='$SUSPENDED_DNS'
SUSPENDED_MAIL='$SUSPENDED_MAIL'
SUSPENDED_DB='$SUSPENDED_DB'
SUSPENDED_CRON='$SUSPENDED_CRON'
IP_OWNED='$IP_OWNED'
U_DIR_DISK='$U_DIR_DISK'
U_DISK='$U_DISK'
U_BANDWIDTH='$U_BANDWIDTH'
U_WEB_DOMAINS='$U_WEB_DOMAINS'
U_WEB_SSL='$U_WEB_SSL'
U_WEB_ALIASES='$U_WEB_ALIASES'
U_DNS_DOMAINS='$U_DNS_DOMAINS'
U_DATABASES='$U_DATABASES'
U_DNS_RECORDS='$U_DNS_RECORDS'
U_MAIL_DOMAINS='$U_MAIL_DOMAINS'
U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS'
U_DATABASES='$U_DATABASES'
U_CRON_JOBS='$U_CRON_JOBS'
DATE='$DATE'" > $V_USERS/$user/user.conf
}
@ -117,9 +125,6 @@ format_validation 'user' 'package'
# Checking user
is_user_valid
# Checking user is active
is_user_suspended
# Checking package
is_package_valid
@ -131,9 +136,6 @@ is_package_avalable
# Action #
#----------------------------------------------------------#
# Get old package value
old_package=$(get_user_value '$PACKAGE')
# Changing user package
change_user_package

73
bin/v_delete_db_bases Executable file
View file

@ -0,0 +1,73 @@
#!/bin/bash
# info: delete user databases
# options: user
#
# The function deletes all user databases.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
user=$1
# Importing variables
source $VESTA/conf/vars.conf
source $V_CONF/vesta.conf
source $V_FUNC/shared.func
source $V_FUNC/db.func
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
# Checking arg number
check_args '1' "$#" 'user'
# Checking argument format
format_validation 'user'
# Checking web system is enabled
is_system_enabled 'db'
# Checking user
is_user_valid
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/db.conf"
# Defining fileds to select
field='$DB'
# Defining search string
search_string="SUSPENDED='no'"
# Parsing unsuspeneded domains
databases=$(db_clear_search)
# Starting delete loop
for database in $databases; do
$V_BIN/v_delete_db_base "$user" "$database"
rv="$?"
if [ "$rv" -ne '0' ]; then
log_event 'debug' "$rv $V_EVENT"
exit $rv
fi
done
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_event 'system' "$V_EVENT"
exit

2
bin/v_delete_dns_domains
View file

@ -47,7 +47,7 @@ conf="$V_USERS/$user/dns.conf"
field='$DOMAIN'
# Defining search string
search_string="SUSPEND='no'"
search_string="SUSPENDED='no'"
# Parsing domain list
domains=$(dom_clear_search)

2
bin/v_delete_web_domains
View file

@ -47,7 +47,7 @@ conf="$V_USERS/$user/web.conf"
field='$DOMAIN'
# Defining search string
search_string="SUSPEND='no'"
search_string="SUSPENDED='no'"
# Parsing domain list
domains=$(dom_clear_search)

4
bin/v_list_cron_jobs
View file

@ -114,13 +114,13 @@ is_user_valid
conf=$V_USERS/$user/cron.conf
# Defining fileds to select
fields='$JOB $MIN $HOUR $DAY $MONTH $WDAY $CMD $SUSPEND $DATE'
fields='$JOB $MIN $HOUR $DAY $MONTH $WDAY $CMD $SUSPENDED $DATE'
# Listing domains
case $format in
json) json_list_cron ;;
plain) nohead=1;
fields="\"\$JOB\" \"\$SUSPEND\" \"\$MIN\" \"\$HOUR\" \"\$DAY\""
fields="\"\$JOB\" \"\$SUSPENDED\" \"\$MIN\" \"\$HOUR\" \"\$DAY\""
fields="$fields \"\$MONTH\" \"\$WDAY\" \"\$CMD\"";
shell_list_cron ;;
shell) fields='$JOB~$SUSPEND~$MIN~$HOUR~$DAY~$MONTH~$WDAY~$CMD';

2
bin/v_list_db_base
View file

@ -107,7 +107,7 @@ is_db_valid
conf=$V_USERS/$user/db.conf
# Defining fileds to select
fields='$DB $USER $HOST $TYPE $CHARSET $U_DISK $SUSPEND $DATE'
fields='$DB $USER $HOST $TYPE $CHARSET $U_DISK $SUSPENDED $DATE'
# Listing database
case $format in

2
bin/v_list_db_bases
View file

@ -40,7 +40,7 @@ is_user_valid
conf=$V_USERS/$user/db.conf
# Defining fileds to select
fields='$DB $USER $HOST $TYPE $CHARSET $U_DISK $SUSPEND $DATE'
fields='$DB $USER $HOST $TYPE $CHARSET $U_DISK $SUSPENDED $DATE'
# Listing databases
case $format in

2
bin/v_list_dns_domain
View file

@ -121,7 +121,7 @@ is_dns_domain_valid
conf=$V_USERS/$user/dns/$domain
# Defining fileds to select
fields='$ID $RECORD $TYPE $VALUE $SUSPEND $DATE'
fields='$ID $RECORD $TYPE $VALUE $SUSPENDED $DATE'
# Listing domains
case $format in

4
bin/v_list_dns_domains
View file

@ -40,14 +40,14 @@ is_user_valid
conf=$V_USERS/$user/dns.conf
# Defining fileds to select
fields='$DOMAIN $IP $TPL $TTL $EXP $SOA $SUSPEND $DATE'
fields='$DOMAIN $IP $TPL $TTL $EXP $SOA $SUSPENDED $DATE'
# Listing domains
case $format in
json) json_list ;;
plain) nohead=1; shell_list ;;
shell) fields='$DOMAIN $IP $TPL $TTL $EXP $SUSPEND';
shell) fields='$DOMAIN $IP $TPL $TTL $EXP $DATE';
shell_list| column -t ;;
*) check_args '1' '0' 'user [format]';;
esac

13
bin/v_list_user
View file

@ -94,11 +94,14 @@ is_user_valid
conf=$V_USERS/$user/user.conf
# Defining fileds to select
fields='$USER $FNAME $LNAME $PACKAGE $WEB_DOMAINS $WEB_SSL $WEB_ALIASES
$DATABASES $MAIL_DOMAINS $MAIL_BOXES $MAIL_FORWARDERS $DNS_DOMAINS
$DISK_QUOTA $BANDWIDTH $NS $SHELL $BACKUPS $WEB_TPL $SUSPENDED $CONTACT
$RKEY $REPORTS $IP_OWNED $U_DIR_DISK $U_DISK $U_BANDWIDTH $U_WEB_DOMAINS
$U_WEB_SSL $U_DNS_DOMAINS $U_DATABASES $U_MAIL_DOMAINS $U_CRON_JOBS $DATE'
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 $REPORTS
$RKEY $SUSPENDED $SUSPENDED_USERS $SUSPENDED_WEB $SUSPENDED_DNS
$SUSPENDED_MAIL $SUSPENDED_DB $SUSPENDED_CRON $IP_OWNED $U_DIR_DISK $U_DISK
$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'
# Listing user
case $format in

15
bin/v_list_users
View file

@ -89,13 +89,16 @@ shell_list_users() {
#----------------------------------------------------------#
# Defining fileds to select
fields="\$USER \$FNAME \$LNAME \$PACKAGE \$WEB_DOMAINS \$WEB_SSL \$WEB_ALIASES"
fields="$fields \$DATABASES \$MAIL_DOMAINS \$MAIL_BOXES \$MAIL_FORWARDERS"
fields="$fields \$DNS_DOMAINS \$DISK_QUOTA \$BANDWIDTH \$NS \$SHELL \$BACKUPS"
fields="$fields \$WEB_TPL \$SUSPENDED \$CONTACT \$RKEY \$REPORTS \$IP_OWNED"
fields="\$USER \$FNAME \$LNAME \$PACKAGE \$WEB_DOMAINS \$WEB_ALIASES \$WEB_TPL"
fields="$fields \$DNS_DOMAINS \$DNS_RECORDS \$MAIL_DOMAINS \$MAIL_ACCOUNTS"
fields="$fields \$DATABASES \$CRON_JOBS \$DISK_QUOTA \$BANDWIDTH \$NS \$SHELL"
fields="$fields \$BACKUPS \$CONTACT \$REPORTS \$RKEY \$SUSPENDED"
fields="$fields \$SUSPENDED_USERS \$SUSPENDED_WEB \$SUSPENDED_DNS"
fields="$fields \$SUSPENDED_MAIL \$SUSPENDED_DB \$SUSPENDED_CRON \$IP_OWNED"
fields="$fields \$U_DIR_DISK \$U_DISK \$U_BANDWIDTH \$U_WEB_DOMAINS"
fields="$fields \$U_WEB_SSL \$U_DNS_DOMAINS \$U_DATABASES \$U_MAIL_DOMAINS"
fields="$fields \$U_CRON_JOBS \$DATE"
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"
# Listing domains
case $format in

4
bin/v_list_web_domain
View file

@ -96,8 +96,8 @@ is_web_domain_valid
conf=$V_USERS/$user/web.conf
# Defining fileds to select
fields='$DOMAIN $IP $U_DISK $U_BANDWIDTH $TPL $ALIAS $PHP $CGI $ELOG $STATS
$STATS_AUTH $SSL $SSL_HOME $NGINX $NGINX_EXT $SUSPEND $DATE'
fields='$DOMAIN $IP $IP6 $U_DISK $U_BANDWIDTH $TPL $ALIAS $PHP $CGI $ELOG
$STATS $STATS_AUTH $SSL $SSL_HOME $NGINX $NGINX_EXT $SUSPENDED $DATE'
# Listing domains
case $format in

6
bin/v_list_web_domains
View file

@ -40,9 +40,9 @@ is_user_valid
conf=$V_USERS/$user/web.conf
# Defining fileds to select
fields="\$DOMAIN \$IP \$U_DISK \$U_BANDWIDTH \$TPL \$ALIAS \$PHP \$CGI \$ELOG"
fields="$fields \$STATS \$STATS_AUTH \$SSL \$SSL_HOME \$NGINX \$NGINX_EXT"
fields="$fields \$SUSPEND \$DATE"
fields="\$DOMAIN \$IP \$IP6 \$U_DISK \$U_BANDWIDTH \$TPL \$ALIAS \$PHP \$CGI"
fields="$fields \$ELOG \$STATS \$STATS_AUTH \$SSL \$SSL_HOME \$NGINX"
fields="$fields \$NGINX_EXT \$SUSPENDED \$DATE"
# Listing domains
case $format in

4
bin/v_rebuild_dns_domains
View file

@ -80,7 +80,7 @@ for domain in $domains; do
exp="$(get_dns_domain_value '$EXP')"
soa="$(get_dns_domain_value '$SOA')"
ttl="$(get_dns_domain_value '$TTL')"
suspend="$(get_dns_domain_value '$SUSPEND')"
suspended="$(get_dns_domain_value '$SUSPENDED')"
# Checking zone file
if [ ! -e "$V_USERS/$user/dns/$domain" ]; then
@ -112,7 +112,7 @@ for domain in $domains; do
# Bind config check
nconf='/etc/named.conf'
if [ "$suspend" = 'yes' ]; then
if [ "$suspended" = 'yes' ]; then
rm_string=$(grep -n /etc/namedb/$domain.db $nconf | cut -d : -f 1)
if [ ! -z "$rm_string" ]; then
sed -i "$rm_string d" $nconf

2
bin/v_rebuild_web_domains
View file

@ -135,7 +135,7 @@ for domain in $(shell_list) ; do
chmod 640 $conf
if [ "$SSL" = 'yes' ]; then
if [ "$SUSPEND" = 'yes' ]; then
if [ "$SUSPENDED" = 'yes' ]; then
proxy_string="rewrite ^(.*)\$ http://$url;"
else
proxy_string="proxy_pass https://$ip:$WEB_SSL_PORT;"

2
bin/v_suspend_cron_job
View file

@ -45,7 +45,7 @@ is_job_suspended
#----------------------------------------------------------#
# Suspending job
update_cron_job_value '$SUSPEND' 'yes'
update_cron_job_value '$SUSPENDED' 'yes'
# Sync system cron with user
sync_cron_jobs

4
bin/v_suspend_cron_jobs
View file

@ -40,12 +40,12 @@ is_user_valid
# Searching jobs
conf="$V_USERS/$user/cron.conf"
field='$JOB'
search_string="SUSPEND='no'"
search_string="SUSPENDED='no'"
jobs=$(cron_clear_search)
# Suspendning
for job in $jobs; do
update_cron_job_value '$SUSPEND' 'yes'
update_cron_job_value '$SUSPENDED' 'yes'
done
# Sync system cron with user

2
bin/v_suspend_db_base
View file

@ -64,7 +64,7 @@ esac
#----------------------------------------------------------#
# Updating db value
update_db_base_value '$SUSPEND' 'yes'
update_db_base_value '$SUSPENDED' 'yes'
# Logging
log_event 'system' "$V_EVENT"

4
bin/v_suspend_db_bases
View file

@ -47,7 +47,7 @@ conf="$V_USERS/$user/db.conf"
field='$DB'
# Defining search string
search_string="SUSPEND='no'"
search_string="SUSPENDED='no'"
# Parsing unsuspeneded domains
databases=$(db_clear_search)
@ -65,7 +65,7 @@ for database in $databases; do
esac
# Updating db value
update_db_base_value '$SUSPEND' 'yes'
update_db_base_value '$SUSPENDED' 'yes'
done

2
bin/v_suspend_dns_domain
View file

@ -62,7 +62,7 @@ fi
#----------------------------------------------------------#
# Adding suspend in config
update_dns_domain_value '$SUSPEND' 'yes'
update_dns_domain_value '$SUSPENDED' 'yes'
# Adding task to the vesta pipe
restart_schedule 'dns'

4
bin/v_suspend_dns_domains
View file

@ -47,7 +47,7 @@ conf="$V_USERS/$user/dns.conf"
field='$DOMAIN'
# Defining search string
search_string="SUSPEND='no'"
search_string="SUSPENDED='no'"
# Parsing unsuspeneded domains
domains=$(dom_clear_search)
@ -61,7 +61,7 @@ for domain in $domains; do
sed -i "$rm_string d" $conf
fi
# Adding suspend in config
update_dns_domain_value '$SUSPEND' 'yes'
update_dns_domain_value '$SUSPENDED' 'yes'
done

4
bin/v_suspend_web_domain
View file

@ -57,7 +57,7 @@ is_domain_suspended 'web'
get_web_domain_values
tpl_file="$V_WEBTPL/apache_$TPL.tpl"
conf="$V_HOME/$user/conf/httpd.conf"
SUSPEND='yes'
SUSPENDED='yes'
# Preparing domain values for the template substitution
upd_web_domain_values
@ -96,7 +96,7 @@ fi
#----------------------------------------------------------#
# Adding suspend in config
update_web_domain_value '$SUSPEND' 'yes'
update_web_domain_value '$SUSPENDED' 'yes'
# Adding task to the vesta pipe
restart_schedule 'web'

2
bin/v_suspend_web_domains
View file

@ -48,7 +48,7 @@ conf="$V_USERS/$user/web.conf"
# Defining fileds to select
field='$DOMAIN'
search_string="SUSPEND='no'"
search_string="SUSPENDED='no'"
domains=$(dom_clear_search)
# Starting suspend loop

2
bin/v_unsuspend_cron_job
View file

@ -45,7 +45,7 @@ is_job_unsuspended
#----------------------------------------------------------#
# Unsuspending job
update_cron_job_value '$SUSPEND' 'no'
update_cron_job_value '$SUSPENDED' 'no'
# Sync system cron with user
sync_cron_jobs

4
bin/v_unsuspend_cron_jobs
View file

@ -40,12 +40,12 @@ is_user_valid
# Searching jobs
conf="$V_USERS/$user/cron.conf"
field='$JOB'
search_string="SUSPEND='yes'"
search_string="SUSPENDED='yes'"
jobs=$(cron_clear_search)
# Unsuspendning jobs
for job in $jobs; do
update_cron_job_value '$SUSPEND' 'no'
update_cron_job_value '$SUSPENDED' 'no'
done
# Sync system cron with user

2
bin/v_unsuspend_db_base
View file

@ -64,7 +64,7 @@ esac
#----------------------------------------------------------#
# Updating db value
update_db_base_value '$SUSPEND' 'no'
update_db_base_value '$SUSPENDED' 'no'
# Logging
log_event 'system' "$V_EVENT"

4
bin/v_unsuspend_db_bases
View file

@ -47,7 +47,7 @@ conf="$V_USERS/$user/db.conf"
field='$DB'
# Defining search string
search_string="SUSPEND='yes'"
search_string="SUSPENDED='yes'"
# Parsing unsuspeneded domains
databases=$(db_clear_search)
@ -65,7 +65,7 @@ for database in $databases; do
esac
# Updating db value
update_db_base_value '$SUSPEND' 'no'
update_db_base_value '$SUSPENDED' 'no'
done

2
bin/v_unsuspend_dns_domain
View file

@ -60,7 +60,7 @@ echo "$nmd_rec" >> $conf
#----------------------------------------------------------#
# Unsuspending domain in config
update_dns_domain_value '$SUSPEND' 'no'
update_dns_domain_value '$SUSPENDED' 'no'
# Adding task to the vesta pipe
restart_schedule 'dns'

4
bin/v_unsuspend_dns_domains
View file

@ -47,7 +47,7 @@ conf="$V_USERS/$user/dns.conf"
field='$DOMAIN'
# Defining search string
search_string="SUSPEND='yes'"
search_string="SUSPENDED='yes'"
# Parsing suspeneded domains
domains=$(dom_clear_search)
@ -64,7 +64,7 @@ for domain in $domains; do
echo "$rec" >> $conf
# Unsuspendin in config
update_dns_domain_value '$SUSPEND' 'no'
update_dns_domain_value '$SUSPENDED' 'no'
done

4
bin/v_unsuspend_web_domain
View file

@ -52,7 +52,7 @@ is_domain_unsuspended 'web'
get_web_domain_values
tpl_file="$V_WEBTPL/apache_$TPL.tpl"
conf="$V_HOME/$user/conf/httpd.conf"
SUSPEND='no'
SUSPENDED='no'
# Preparing domain values for the template substitution
upd_web_domain_values
@ -91,7 +91,7 @@ fi
#----------------------------------------------------------#
# Adding suspend in config
update_web_domain_value '$SUSPEND' 'no'
update_web_domain_value '$SUSPENDED' 'no'
# Adding task to the vesta pipe
restart_schedule 'web'

2
bin/v_unsuspend_web_domains
View file

@ -43,7 +43,7 @@ is_user_valid
# Defining fileds to select
conf="$V_USERS/$user/web.conf"
field='$DOMAIN'
search_string="SUSPEND='yes'"
search_string="SUSPENDED='yes'"
domains=$(dom_clear_search)
# Starting unsuspend loop

2
bin/v_update_db_bases_disk
View file

@ -47,7 +47,7 @@ conf="$V_USERS/$user/db.conf"
field='$DB'
# Defining search string
search_string="SUSPEND='no'"
search_string="SUSPENDED='no'"
# Parsing unsuspeneded domains
databases=$(db_clear_search)

2
bin/v_update_web_domains_disk
View file

@ -45,7 +45,7 @@ conf="$V_USERS/$user/web.conf"
# Defining fileds to select
field='$DOMAIN'
search_string="SUSPEND='no'"
search_string="SUSPENDED='no'"
domains=$(dom_clear_search)
# Starting update disk loop

2
bin/v_update_web_domains_stat
View file

@ -43,7 +43,7 @@ is_user_valid
# Defining fileds to select
field='$DOMAIN'
conf="$V_USERS/$user/web.conf"
search_string="SUSPEND='no'"
search_string="SUSPENDED='no'"
# Parsing domain list
domains=$(dom_clear_search)

2
bin/v_update_web_domains_traff
View file

@ -47,7 +47,7 @@ conf="$V_USERS/$user/web.conf"
field='$DOMAIN'
# Defining search string
search_string="SUSPEND='no'"
search_string="SUSPENDED='no'"
# Parsing unsuspeneded domains
domains=$(dom_clear_search)

18
data/packages/default.pkg
View file

@ -1,14 +1,14 @@
WEB_DOMAINS='10'
WEB_SSL='10'
WEB_ALIASES='10'
WEB_DOMAINS='100'
WEB_ALIASES='100'
WEB_TPL='default,phpcgi,unlim,phpfcgid'
DATABASES='10'
MAIL_DOMAINS='10'
MAIL_BOXES='30'
MAIL_FORWARDERS='30'
DNS_DOMAINS='10'
DNS_DOMAINS='100'
DNS_RECORDS='100'
MAIL_DOMAINS='100'
MAIL_ACCOUNTS='100'
DATABASES='100'
CRON_JOBS='100'
DISK_QUOTA='10000'
BANDWIDTH='10000'
BANDWIDTH='100000'
NS='ns1.localhost,ns2.localhost'
SHELL='nologin'
BACKUPS='3'

16
data/packages/palegreen.pkg
View file

@ -1,12 +1,12 @@
WEB_DOMAINS='30'
WEB_SSL='30'
WEB_DOMAINS='50'
WEB_ALIASES='50'
WEB_TPL='default,phpcgi,unlim,phpfcgid'
DATABASES='30'
MAIL_DOMAINS='30'
MAIL_BOXES='50'
MAIL_FORWARDERS='50'
DNS_DOMAINS='30'
WEB_TPL='default'
DNS_DOMAINS='50'
DNS_RECORDS='50'
MAIL_DOMAINS='50'
MAIL_ACCOUNTS='50'
DATABASES='50'
CRON_JOBS='50'
DISK_QUOTA='50000'
BANDWIDTH='50000'
NS='ns1.localhost,ns2.localhost'

6
func/cron.func
View file

@ -48,7 +48,7 @@ sync_cron_jobs() {
eval ${key%%=*}="${key#*=}"
done
if [ "$SUSPEND" = 'no' ] ; then
if [ "$SUSPENDED" = 'no' ] ; then
# Adding line to system cron
echo "$MIN $HOUR $DAY $MONTH $WDAY $CMD" |\
sed -e "s/%quote%/'/g" -e "s/%dots%/:/g" >> $conf
@ -75,7 +75,7 @@ del_cron_job() {
is_job_suspended() {
# Parsing jobs
str=$(grep "JOB='$job'" $V_USERS/$user/cron.conf|grep "SUSPEND='yes'" )
str=$(grep "JOB='$job'" $V_USERS/$user/cron.conf|grep "SUSPENDED='yes'" )
# Checkng key
if [ ! -z "$str" ]; then
@ -87,7 +87,7 @@ is_job_suspended() {
is_job_unsuspended() {
# Parsing jobs
str=$(grep "JOB='$job'" $V_USERS/$user/cron.conf|grep "SUSPEND='no'" )
str=$(grep "JOB='$job'" $V_USERS/$user/cron.conf|grep "SUSPENDED='no'" )
# Checkng key
if [ ! -z "$str" ]; then

4
func/db.func
View file

@ -348,7 +348,7 @@ is_pgsql_host_alive() {
is_db_suspended() {
config="$V_USERS/$user/db.conf"
check_db=$(grep "DB='$database'" $config|grep "SUSPEND='yes'")
check_db=$(grep "DB='$database'" $config|grep "SUSPENDED='yes'")
# Checking result
if [ ! -z "$check_db" ]; then
@ -360,7 +360,7 @@ is_db_suspended() {
is_db_unsuspended() {
config="$V_USERS/$user/db.conf"
check_db=$(grep "DB='$database'" $config|grep "SUSPEND='yes'")
check_db=$(grep "DB='$database'" $config|grep "SUSPENDED='yes'")
# Checking result
if [ -z "$check_db" ]; then

6
func/domain.func
View file

@ -108,7 +108,7 @@ is_domain_suspended() {
config_type="$1"
# Parsing domain values
check_domain=$(grep "DOMAIN='$domain'" $V_USERS/$user/$config_type.conf|\
grep "SUSPEND='yes'")
grep "SUSPENDED='yes'")
# Checking result
if [ ! -z "$check_domain" ]; then
@ -122,7 +122,7 @@ is_domain_unsuspended() {
config_type="$1"
# Parsing domain values
check_domain=$(grep "DOMAIN='$domain'" $V_USERS/$user/$config_type.conf|\
grep "SUSPEND='no'")
grep "SUSPENDED='no'")
# Checking result
if [ ! -z "$check_domain" ]; then
@ -741,7 +741,7 @@ upd_web_domain_values() {
fi
# Checking suspend
if [ "$SUSPEND" = 'yes' ]; then
if [ "$SUSPENDED" = 'yes' ]; then
docroot_string="Redirect / http://$url"
proxy_string="rewrite ^(.*)\$ http://$url;"
fi