liberal coding convetion

This commit is contained in:
Serghey Rodin 2011-11-01 12:27:45 +02:00
commit 2000d8f73b
105 changed files with 316 additions and 317 deletions

View file

@ -6,13 +6,13 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
database="$user"_"$2"
db_user="$user"_"$3"
db_password="$4"
type="$5"
db_password=$4
type=$5
host=$6
encoding="${7-UTF8}"
encoding=${7-UTF8}
# Importing variables
source $VESTA/conf/vars.conf
@ -89,4 +89,4 @@ V_EVENT="$dt $V_SCRIPT $user $database $db_user ***** $type $host"
log_history "$V_EVENT" "v_del_db_base $user $database"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,14 +6,14 @@
#----------------------------------------------------------#
# Argument defenition
type="$1"
host="$2"
port="$3"
db_user="$4"
db_password="$5"
max_usr="${6-300}"
max_db="${7-300}"
template="${8-template1}"
type=$1
host=$2
port=$3
db_user=$4
db_password=$5
max_usr=${6-300}
max_db=${7-300}
template=${8-template1}
# Importing variables
@ -81,4 +81,4 @@ V_EVENT=$(echo $V_EVENT | sed -e "s/$db_password/xxxxxx/g")
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,15 +6,15 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
ip="$3"
template="${4-default}"
ip=$3
template=${4-default}
next_year=$(date +%m-%d-%y -d "+ 1 year")
exp="${5-$next_year}"
soa="$6"
ttl="${7-14400}"
exp=${5-$next_year}
soa=$6
ttl=${7-14400}
# Importing variables
source $VESTA/conf/vars.conf
@ -117,4 +117,4 @@ restart_schedule 'dns'
log_history "$V_EVENT" "v_del_dns_domain $user $domain"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,13 +6,13 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
record=$(idn -t --quiet -u "$3" )
rtype=$(echo "$4"| tr '[:lower:]' '[:upper:]')
dvalue=$(idn -t --quiet -u "$5" )
id="$6"
id=$6
# Importing variables
source $VESTA/conf/vars.conf
@ -87,4 +87,4 @@ restart_schedule 'dns'
log_history "$V_EVENT" "v_del_dns_domain_record $user $domain $id"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
cert="$2"
user=$1
cert=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -54,4 +54,4 @@ mv $V_TMP/$cert.key $V_USERS/$user/cert/
log_history "$V_EVENT" "v_del_ssl_certificate $user $cert"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,14 +6,14 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
min="$2"
hour="$3"
day="$4"
month="$5"
wday="$6"
command="$7"
job="$8"
user=$1
min=$2
hour=$3
day=$4
month=$5
wday=$6
command=$7
job=$8
# Importing variables
source $VESTA/conf/vars.conf
@ -79,4 +79,4 @@ restart_schedule 'cron'
log_history "$V_EVENT" "v_del_sys_cron $user $job"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,12 +6,12 @@
#----------------------------------------------------------#
# Argument defenition
ip="$1"
mask="$2"
ip=$1
mask=$2
interface="${3-eth0}"
user="${4-vesta}"
ip_status="${5-shared}"
ip_name="$6"
ip_name=$6
# Importing variables
source $VESTA/conf/vars.conf
@ -91,4 +91,4 @@ fi
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
password="$2"
email="$3"
package="${4-default}"
user=$1
password=$2
email=$3
package=${4-default}
fname=$5
lname=$6
@ -154,4 +154,4 @@ V_EVENT="$dt $V_SCRIPT $user ***** $email $package $fname $lname"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -56,4 +56,4 @@ restart_schedule 'cron'
log_history "$V_EVENT" "v_del_sys_user_reports $user"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
ip="$3"
ip=$3
template=${4-default}
# Importing variables
@ -204,4 +204,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "v_del_web_domain $user $domain"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
dom_alias=$(idn -t --quiet -u "$3" )
@ -108,4 +108,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "v_del_web_domain_alias $user $domain $dom_alias"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -96,4 +96,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "v_del_web_domain_cgi $user $domain"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -95,4 +95,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "v_del_web_domain_elog $user $domain"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,13 +6,13 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
template="${3-default}"
template=${3-default}
default_extentions="jpg,jpeg,gif,png,ico,css,zip,tgz,gz,rar,bz2,doc,xls,exe,\
pdf,ppt,txt,tar,wav,bmp,rtf,js,mp3,avi,mpeg,html,htm"
extentions="${4-$default_extentions}"
extentions=${4-$default_extentions}
# Importing variables
source $VESTA/conf/vars.conf
@ -130,4 +130,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "v_del_web_domain_nginx $user $domain"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,11 +6,11 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
cert="$3"
tpl_option="${4-single}"
cert=$3
tpl_option=${4-single}
# Importing variables
source $VESTA/conf/vars.conf
@ -128,4 +128,4 @@ update_web_domain_value '$SSL_CERT' "$cert"
log_history "$V_EVENT" "v_del_web_domain_ssl $user $domain"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
type="$3"
type=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -85,4 +85,4 @@ update_web_domain_value '$STATS' "$type"
log_history "$V_EVENT" "v_del_web_domain_stat $user $domain"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
auth_user="$3"
auth_pass="$4"
auth_user=$3
auth_pass=$4
# Importing variables
source $VESTA/conf/vars.conf
@ -96,4 +96,4 @@ V_EVENT="$(date +%m-%d-%y" "%H:%m:%S) $V_SCRIPT $user $domain $auth_user *****"
log_history "$V_EVENT" "v_del_web_domain_stat_auth $user $domain $auth_user"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
output="$2"
user=$1
output=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -538,4 +538,4 @@ fi
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -33,4 +33,4 @@ done
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
database="$2"
db_password="$3"
user=$1
database=$2
db_password=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -68,4 +68,4 @@ V_EVENT="$(date +%m-%d-%y" "%H:%m:%S) $V_SCRIPT $user $database *****"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
exp="$3"
exp=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -62,4 +62,4 @@ update_dns_domain_value '$EXP' "$exp"
log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_exp"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
ip="$3"
ip=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -70,4 +70,4 @@ restart_schedule 'dns'
log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ip"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
id="$3"
id=$3
record=$(idn -t --quiet -u "$4" )
rtype=$(echo "$5"| tr '[:lower:]' '[:upper:]')
value=$(idn -t --quiet -u "$6" )
@ -84,4 +84,4 @@ restart_schedule 'dns'
log_history "$V_EVENT"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
soa="$3"
soa=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -67,4 +67,4 @@ restart_schedule 'dns'
log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_soa"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
template="$3"
template=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -81,4 +81,4 @@ restart_schedule 'dns'
log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_tpl"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
ttl="$3"
ttl=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -68,4 +68,4 @@ restart_schedule 'dns'
log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ttl"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,14 +6,14 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
job="$2"
min="$3"
hour="$4"
day="$5"
month="$6"
wday="$7"
command="$8"
user=$1
job=$2
min=$3
hour=$4
day=$5
month=$6
wday=$7
command=$8
# Importing variables
source $VESTA/conf/vars.conf
@ -79,4 +79,4 @@ restart_schedule 'cron'
log_history "$V_EVENT"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
ip="$1"
ip_name="$2"
ip=$1
ip_name=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -44,4 +44,4 @@ update_sys_ip_value '$NAME' "$ip_name"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
ip="$2"
user=$1
ip=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -61,4 +61,4 @@ fi
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
ip="$1"
ip_status="$2"
ip=$1
ip_status=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -64,4 +64,4 @@ update_sys_ip_value '$STATUS' "$ip_status"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
email="$2"
user=$1
email=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -54,4 +54,4 @@ sed -i "$str s/$old_email/$email/g" /etc/passwd
log_history "$V_EVENT" "$V_SCRIPT $user $old_email"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
fname="$2"
lname="$3"
user=$1
fname=$2
lname=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -53,4 +53,4 @@ update_user_value "$user" '$LNAME' "$lname"
log_history "$V_EVENT" "$V_SCRIPT $user $old_fname $old_lname"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,15 +6,15 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
ns1="$2"
ns2="$3"
ns3="$4"
ns4="$5"
ns5="$6"
ns6="$7"
ns7="$8"
ns8="$9"
user=$1
ns1=$2
ns2=$3
ns3=$4
ns4=$5
ns5=$6
ns6=$7
ns7=$8
ns8=$9
# Importing variables
source $VESTA/conf/vars.conf
@ -84,4 +84,4 @@ update_user_value "$user" '$NS' "$ns"
log_history "$V_EVENT" "$V_SCRIPT $user ${old_ns//,/ }"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
package="$2"
user=$1
package=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -55,4 +55,4 @@ change_user_package
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
password="$2"
user=$1
password=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -49,4 +49,4 @@ V_EVENT="$(date +%m-%d-%y" "%H:%m:%S) $V_SCRIPT $user *****"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
shell="$2"
user=$1
shell=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -52,4 +52,4 @@ shell_path=$(get_shell_path)
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
ip="$3"
ip=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -94,4 +94,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ip"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
certificate="$3"
certificate=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -106,4 +106,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ssl_cert"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
tpl_option="$3"
tpl_option=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -107,4 +107,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "$V_SCRIPT $user $domain $ssl_home"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
template="$3"
template=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -157,4 +157,4 @@ restart_schedule 'web'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
database="$2"
user=$1
database=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -73,4 +73,4 @@ del_db_vesta
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -65,4 +65,4 @@ done
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
type="$1"
host="$2"
type=$1
host=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -53,4 +53,4 @@ del_dbhost_vesta
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
named_conf=/etc/named.conf
@ -75,4 +75,4 @@ restart_schedule 'dns'
log_history "$V_EVENT" "v_add_dns_domain $user $domain $old_ip $tpl_name"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
id="$3"
id=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -71,4 +71,4 @@ restart_schedule 'dns'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -65,4 +65,4 @@ done
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
cert="$2"
user=$1
cert=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -54,4 +54,4 @@ rm -f $V_USERS/$user/cert/$cert.*
log_history "$V_EVENT"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
job="$2"
user=$1
job=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -59,4 +59,4 @@ restart_schedule 'cron'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
ip="$1"
ip=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -87,4 +87,4 @@ fi
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -127,4 +127,4 @@ rm -rf $V_USERS/$user
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -56,4 +56,4 @@ restart_schedule 'cron'
log_history "$V_EVENT" "v_add_sys_user_reports $user"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -149,4 +149,4 @@ restart_schedule 'web'
log_history "$V_EVENT"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain" )
dom_alias=$(idn -t --quiet -u "$3" )
@ -103,4 +103,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "v_add_web_domain_alias $user $domain $dom_alias"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -96,4 +96,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "v_add_web_domain_cgi $user $domain"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -95,4 +95,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "v_add_web_domain_elog $user $domain"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -102,4 +102,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "v_add_web_domain_nginx $user $domain $tpl_name $ext"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -98,4 +98,4 @@ restart_schedule 'web'
log_history "$V_EVENT" "v_add_web_domain_ssl $user $domain $cert $tpl_option"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
# Importing variables
@ -81,4 +81,4 @@ update_web_domain_value '$STATS' ''
log_history "$V_EVENT" "v_add_web_domain_stat $user $doman $type"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
auth_user="$3"
auth_user=$3
# Importing variables
source $VESTA/conf/vars.conf
@ -102,4 +102,4 @@ update_web_domain_value '$STATS_AUTH' "$new_val"
log_history "$V_EVENT"
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -65,4 +65,4 @@ done
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
@ -55,4 +55,4 @@ echo "$value"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
key=$(echo "$2"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
# Importing variables
@ -49,4 +49,4 @@ echo "$value"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
@ -58,4 +58,4 @@ echo "$value"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -129,4 +129,4 @@ restart_schedule 'dns'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -49,4 +49,4 @@ restart_schedule 'cron'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -15,7 +14,7 @@ source $V_FUNC/shared_func.sh
source $V_FUNC/domain_func.sh
source $V_FUNC/ip_func.sh
url="${2-$V_SUSPEND_URL}"
url=${2-$V_SUSPEND_URL}
#----------------------------------------------------------#
# Verifications #
@ -274,4 +273,4 @@ restart_schedule 'web'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
database="$2"
user=$1
database=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -64,4 +64,4 @@ update_db_base_value '$SUSPEND' 'yes'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -71,4 +71,4 @@ done
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -65,4 +65,4 @@ restart_schedule 'dns'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -70,4 +70,4 @@ restart_schedule 'dns'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
job="$2"
user=$1
job=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -56,4 +56,4 @@ restart_schedule 'cron'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -57,4 +57,4 @@ restart_schedule 'cron'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -103,4 +103,4 @@ restart_schedule 'web'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -121,4 +121,4 @@ restart_schedule 'web'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
database="$2"
user=$1
database=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -64,4 +64,4 @@ update_db_base_value '$SUSPEND' 'no'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -71,4 +71,4 @@ done
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -63,4 +63,4 @@ restart_schedule 'dns'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -74,4 +74,4 @@ restart_schedule 'dns'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
job="$2"
user=$1
job=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -56,4 +56,4 @@ restart_schedule 'cron'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -57,4 +57,4 @@ restart_schedule 'cron'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -115,4 +115,4 @@ restart_schedule 'web'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -126,4 +126,4 @@ restart_schedule 'web'
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,8 +6,8 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
database="$2"
user=$1
database=$2
# Importing variables
source $VESTA/conf/vars.conf
@ -73,4 +73,4 @@ update_user_value "$user" '$U_DISK' "$disk_size"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -77,4 +77,4 @@ update_user_value "$user" '$U_DISK' "$disk_size"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,10 +6,10 @@
#----------------------------------------------------------#
# Argument defenition
owner="$1"
ip_status="$2"
owner="${3-vesta}"
ip_status="${4-shared}"
owner=$1
ip_status=$2
owner=${3-vesta}
ip_status=${4-shared}
# Importing variables
source $VESTA/conf/vars.conf # include for internal func
@ -103,4 +103,4 @@ fi
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -5,7 +5,7 @@
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
pipe="$1"
pipe=$1
# Importing system enviroment as we run this script
# mostly by cron wich not read it by itself
@ -72,4 +72,4 @@ esac
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -63,4 +63,4 @@ fi
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
rrd_start="${1--1d}"
rrd_end="${2-now}"
rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
rrd_start=${1--1d}
rrd_end=${2-now}
rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
# Importing variables
source $VESTA/conf/vars.conf
@ -84,4 +84,4 @@ if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
fi
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
rrd_start="${1--1d}"
rrd_end="${2-now}"
rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
rrd_start=${1--1d}
rrd_end=${2-now}
rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
# Importing variables
source $VESTA/conf/vars.conf
@ -92,4 +92,4 @@ if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
fi
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
rrd_start="${1--1d}"
rrd_end="${2-now}"
rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
rrd_start=${1--1d}
rrd_end=${2-now}
rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
# Importing variables
source $VESTA/conf/vars.conf
@ -89,4 +89,4 @@ if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
fi
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
rrd_start="${1--1d}"
rrd_end="${2-now}"
rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
rrd_start=${1--1d}
rrd_end=${2-now}
rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
# Importing variables
source $VESTA/conf/vars.conf
@ -89,4 +89,4 @@ if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
fi
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
rrd_start="${1--1d}"
rrd_end="${2-now}"
rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
rrd_start=${1--1d}
rrd_end=${2-now}
rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
# Importing variables
source $VESTA/conf/vars.conf
@ -29,7 +29,7 @@ fi
conf="$V_DB/mysql.conf"
fields='$HOST'
nohead=1
hosts=$(shel_list)
hosts=$(shell_list)
check_row=$(echo "$hosts" |wc -l)
if [ 0 -eq "$check_row" ]; then
exit
@ -129,4 +129,4 @@ done
# Vesta #
#----------------------------------------------------------#
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
rrd_start="${1--1d}"
rrd_end="${2-now}"
rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
rrd_start=${1--1d}
rrd_end=${2-now}
rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
# Importing variables
source $VESTA/conf/vars.conf
@ -102,4 +102,4 @@ done
# Vesta #
#----------------------------------------------------------#
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
rrd_start="${1--1d}"
rrd_end="${2-now}"
rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
rrd_start=${1--1d}
rrd_end=${2-now}
rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
# Importing variables
source $VESTA/conf/vars.conf
@ -81,4 +81,4 @@ if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
fi
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
rrd_start="${1--1d}"
rrd_end="${2-now}"
rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
rrd_start=${1--1d}
rrd_end=${2-now}
rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
# Importing variables
source $VESTA/conf/vars.conf
@ -135,4 +135,4 @@ done
# Vesta #
#----------------------------------------------------------#
exit $OK
exit

View file

@ -6,9 +6,9 @@
#----------------------------------------------------------#
# Argument defenition
rrd_start="${1--1d}"
rrd_end="${2-now}"
rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
rrd_start=${1--1d}
rrd_end=${2-now}
rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
# Importing variables
source $VESTA/conf/vars.conf
@ -83,4 +83,4 @@ if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
fi
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing system enviroment as we run this script
# mostly by cron wich not read it by itself
@ -144,4 +144,4 @@ done
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
# Importing variables
source $VESTA/conf/vars.conf
@ -64,4 +64,4 @@ update_user_value "$user" '$U_DISK' "$disk_size"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -9,7 +9,7 @@
#----------------------------------------------------------#
# Argument defenition
version="$1"
version=$1
updates=''
# Importing system enviroment
@ -109,4 +109,4 @@ fi
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

View file

@ -6,7 +6,7 @@
#----------------------------------------------------------#
# Argument defenition
user="$1"
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
@ -66,4 +66,4 @@ update_user_value "$user" '$U_DISK' "$disk_size"
# Logging
log_event 'system' "$V_EVENT"
exit $OK
exit

Some files were not shown because too many files have changed in this diff Show more