From 2000d8f73b983f8a2eec812175d3001cdaad5fc0 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 1 Nov 2011 12:27:45 +0200 Subject: [PATCH] liberal coding convetion --- bin/v_add_db_base | 10 +++++----- bin/v_add_db_host | 18 +++++++++--------- bin/v_add_dns_domain | 14 +++++++------- bin/v_add_dns_domain_record | 6 +++--- bin/v_add_ssl_certificate | 6 +++--- bin/v_add_sys_cron | 18 +++++++++--------- bin/v_add_sys_ip | 8 ++++---- bin/v_add_sys_user | 10 +++++----- bin/v_add_sys_user_reports | 4 ++-- bin/v_add_web_domain | 6 +++--- bin/v_add_web_domain_alias | 4 ++-- bin/v_add_web_domain_cgi | 4 ++-- bin/v_add_web_domain_elog | 4 ++-- bin/v_add_web_domain_nginx | 8 ++++---- bin/v_add_web_domain_ssl | 8 ++++---- bin/v_add_web_domain_stat | 6 +++--- bin/v_add_web_domain_stat_auth | 8 ++++---- bin/v_backup_sys_user | 6 +++--- bin/v_backup_sys_users | 2 +- bin/v_change_db_password | 8 ++++---- bin/v_change_dns_domain_exp | 6 +++--- bin/v_change_dns_domain_ip | 6 +++--- bin/v_change_dns_domain_record | 6 +++--- bin/v_change_dns_domain_soa | 6 +++--- bin/v_change_dns_domain_tpl | 6 +++--- bin/v_change_dns_domain_ttl | 6 +++--- bin/v_change_sys_cron_job | 18 +++++++++--------- bin/v_change_sys_ip_name | 6 +++--- bin/v_change_sys_ip_owner | 6 +++--- bin/v_change_sys_ip_status | 6 +++--- bin/v_change_sys_user_contact | 6 +++--- bin/v_change_sys_user_name | 8 ++++---- bin/v_change_sys_user_ns | 20 ++++++++++---------- bin/v_change_sys_user_package | 6 +++--- bin/v_change_sys_user_password | 6 +++--- bin/v_change_sys_user_shell | 6 +++--- bin/v_change_web_domain_ip | 6 +++--- bin/v_change_web_domain_sslcert | 6 +++--- bin/v_change_web_domain_sslhome | 6 +++--- bin/v_change_web_domain_tpl | 6 +++--- bin/v_del_db_base | 6 +++--- bin/v_del_db_dbases | 4 ++-- bin/v_del_db_host | 6 +++--- bin/v_del_dns_domain | 4 ++-- bin/v_del_dns_domain_record | 6 +++--- bin/v_del_dns_domains | 4 ++-- bin/v_del_ssl_certificate | 6 +++--- bin/v_del_sys_cron | 6 +++--- bin/v_del_sys_ip | 4 ++-- bin/v_del_sys_user | 4 ++-- bin/v_del_sys_user_reports | 4 ++-- bin/v_del_web_domain | 4 ++-- bin/v_del_web_domain_alias | 4 ++-- bin/v_del_web_domain_cgi | 4 ++-- bin/v_del_web_domain_elog | 4 ++-- bin/v_del_web_domain_nginx | 4 ++-- bin/v_del_web_domain_ssl | 4 ++-- bin/v_del_web_domain_stat | 4 ++-- bin/v_del_web_domain_stat_auth | 6 +++--- bin/v_del_web_domains | 4 ++-- bin/v_get_dns_domain_value | 4 ++-- bin/v_get_sys_user_value | 4 ++-- bin/v_get_web_domain_value | 4 ++-- bin/v_rebuild_dns_domains | 4 ++-- bin/v_rebuild_sys_cron | 4 ++-- bin/v_rebuild_web_domains | 7 +++---- bin/v_suspend_db_base | 6 +++--- bin/v_suspend_db_bases | 4 ++-- bin/v_suspend_dns_domain | 4 ++-- bin/v_suspend_dns_domains | 4 ++-- bin/v_suspend_sys_cron_job | 6 +++--- bin/v_suspend_sys_cron_jobs | 4 ++-- bin/v_suspend_web_domain | 4 ++-- bin/v_suspend_web_domains | 4 ++-- bin/v_unsuspend_db_base | 6 +++--- bin/v_unsuspend_db_bases | 4 ++-- bin/v_unsuspend_dns_domain | 4 ++-- bin/v_unsuspend_dns_domains | 4 ++-- bin/v_unsuspend_sys_cron_job | 6 +++--- bin/v_unsuspend_sys_cron_jobs | 4 ++-- bin/v_unsuspend_web_domain | 4 ++-- bin/v_unsuspend_web_domains | 4 ++-- bin/v_upd_db_base_disk | 6 +++--- bin/v_upd_db_bases_disk | 4 ++-- bin/v_upd_sys_ip | 10 +++++----- bin/v_upd_sys_queue | 4 ++-- bin/v_upd_sys_rrd | 2 +- bin/v_upd_sys_rrd_ftp | 8 ++++---- bin/v_upd_sys_rrd_httpd | 8 ++++---- bin/v_upd_sys_rrd_la | 8 ++++---- bin/v_upd_sys_rrd_mem | 8 ++++---- bin/v_upd_sys_rrd_mysql | 10 +++++----- bin/v_upd_sys_rrd_net | 8 ++++---- bin/v_upd_sys_rrd_nginx | 8 ++++---- bin/v_upd_sys_rrd_pgsql | 8 ++++---- bin/v_upd_sys_rrd_ssh | 8 ++++---- bin/v_upd_sys_user_bill | 4 ++-- bin/v_upd_sys_user_disk | 4 ++-- bin/v_upd_sys_vesta | 4 ++-- bin/v_upd_web_domain_disk | 4 ++-- bin/v_upd_web_domain_stat | 4 ++-- bin/v_upd_web_domain_traff | 4 ++-- bin/v_upd_web_domains_disk | 4 ++-- bin/v_upd_web_domains_stat | 4 ++-- bin/v_upd_web_domains_traff | 4 ++-- 105 files changed, 316 insertions(+), 317 deletions(-) diff --git a/bin/v_add_db_base b/bin/v_add_db_base index c67bc08a9..12344c6d6 100755 --- a/bin/v_add_db_base +++ b/bin/v_add_db_base @@ -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 diff --git a/bin/v_add_db_host b/bin/v_add_db_host index 7c7591184..c0b849bb8 100755 --- a/bin/v_add_db_host +++ b/bin/v_add_db_host @@ -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 diff --git a/bin/v_add_dns_domain b/bin/v_add_dns_domain index 8fc810fe5..a96d26f50 100755 --- a/bin/v_add_dns_domain +++ b/bin/v_add_dns_domain @@ -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 diff --git a/bin/v_add_dns_domain_record b/bin/v_add_dns_domain_record index f37f31fb1..e1e512119 100755 --- a/bin/v_add_dns_domain_record +++ b/bin/v_add_dns_domain_record @@ -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 diff --git a/bin/v_add_ssl_certificate b/bin/v_add_ssl_certificate index ea028e288..b9c8a89f5 100755 --- a/bin/v_add_ssl_certificate +++ b/bin/v_add_ssl_certificate @@ -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 diff --git a/bin/v_add_sys_cron b/bin/v_add_sys_cron index 81ddba59b..58c969599 100755 --- a/bin/v_add_sys_cron +++ b/bin/v_add_sys_cron @@ -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 diff --git a/bin/v_add_sys_ip b/bin/v_add_sys_ip index 0fdb4628c..7320c99f4 100755 --- a/bin/v_add_sys_ip +++ b/bin/v_add_sys_ip @@ -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 diff --git a/bin/v_add_sys_user b/bin/v_add_sys_user index 58abe2989..74fa2950a 100755 --- a/bin/v_add_sys_user +++ b/bin/v_add_sys_user @@ -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 diff --git a/bin/v_add_sys_user_reports b/bin/v_add_sys_user_reports index d1a25bc00..ad234eb4d 100755 --- a/bin/v_add_sys_user_reports +++ b/bin/v_add_sys_user_reports @@ -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 diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain index 3a0bc292c..bcd8e77b6 100755 --- a/bin/v_add_web_domain +++ b/bin/v_add_web_domain @@ -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 diff --git a/bin/v_add_web_domain_alias b/bin/v_add_web_domain_alias index d55b68e5d..f45c4b172 100755 --- a/bin/v_add_web_domain_alias +++ b/bin/v_add_web_domain_alias @@ -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 diff --git a/bin/v_add_web_domain_cgi b/bin/v_add_web_domain_cgi index fffd697c5..6f3be33db 100755 --- a/bin/v_add_web_domain_cgi +++ b/bin/v_add_web_domain_cgi @@ -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 diff --git a/bin/v_add_web_domain_elog b/bin/v_add_web_domain_elog index f75acfe65..ddca5e67b 100755 --- a/bin/v_add_web_domain_elog +++ b/bin/v_add_web_domain_elog @@ -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 diff --git a/bin/v_add_web_domain_nginx b/bin/v_add_web_domain_nginx index 1d75fd151..e32ce0a4a 100755 --- a/bin/v_add_web_domain_nginx +++ b/bin/v_add_web_domain_nginx @@ -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 diff --git a/bin/v_add_web_domain_ssl b/bin/v_add_web_domain_ssl index a98dcdd3d..89cc118e9 100755 --- a/bin/v_add_web_domain_ssl +++ b/bin/v_add_web_domain_ssl @@ -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 diff --git a/bin/v_add_web_domain_stat b/bin/v_add_web_domain_stat index 73e39024b..ad8ba384a 100755 --- a/bin/v_add_web_domain_stat +++ b/bin/v_add_web_domain_stat @@ -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 diff --git a/bin/v_add_web_domain_stat_auth b/bin/v_add_web_domain_stat_auth index 498f92c36..02b9e6a52 100755 --- a/bin/v_add_web_domain_stat_auth +++ b/bin/v_add_web_domain_stat_auth @@ -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 diff --git a/bin/v_backup_sys_user b/bin/v_backup_sys_user index d25e5dbb3..59576d406 100755 --- a/bin/v_backup_sys_user +++ b/bin/v_backup_sys_user @@ -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 diff --git a/bin/v_backup_sys_users b/bin/v_backup_sys_users index 24f58f673..342f61aaa 100755 --- a/bin/v_backup_sys_users +++ b/bin/v_backup_sys_users @@ -33,4 +33,4 @@ done # Logging log_event 'system' "$V_EVENT" -exit $OK +exit diff --git a/bin/v_change_db_password b/bin/v_change_db_password index 9268ba80d..f1767f6ae 100755 --- a/bin/v_change_db_password +++ b/bin/v_change_db_password @@ -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 diff --git a/bin/v_change_dns_domain_exp b/bin/v_change_dns_domain_exp index 2be703b83..6432c51c8 100755 --- a/bin/v_change_dns_domain_exp +++ b/bin/v_change_dns_domain_exp @@ -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 diff --git a/bin/v_change_dns_domain_ip b/bin/v_change_dns_domain_ip index f5e912fb1..dcbbcc0ed 100755 --- a/bin/v_change_dns_domain_ip +++ b/bin/v_change_dns_domain_ip @@ -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 diff --git a/bin/v_change_dns_domain_record b/bin/v_change_dns_domain_record index 04e4c6e42..3a2017b84 100755 --- a/bin/v_change_dns_domain_record +++ b/bin/v_change_dns_domain_record @@ -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 diff --git a/bin/v_change_dns_domain_soa b/bin/v_change_dns_domain_soa index 99dbab3c5..0024172ff 100755 --- a/bin/v_change_dns_domain_soa +++ b/bin/v_change_dns_domain_soa @@ -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 diff --git a/bin/v_change_dns_domain_tpl b/bin/v_change_dns_domain_tpl index dccd202ea..5c2f97c61 100755 --- a/bin/v_change_dns_domain_tpl +++ b/bin/v_change_dns_domain_tpl @@ -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 diff --git a/bin/v_change_dns_domain_ttl b/bin/v_change_dns_domain_ttl index 920b26fbb..7d7d7361e 100755 --- a/bin/v_change_dns_domain_ttl +++ b/bin/v_change_dns_domain_ttl @@ -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 diff --git a/bin/v_change_sys_cron_job b/bin/v_change_sys_cron_job index c63a486ea..e4079a020 100755 --- a/bin/v_change_sys_cron_job +++ b/bin/v_change_sys_cron_job @@ -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 diff --git a/bin/v_change_sys_ip_name b/bin/v_change_sys_ip_name index f01f82322..f25222cc4 100755 --- a/bin/v_change_sys_ip_name +++ b/bin/v_change_sys_ip_name @@ -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 diff --git a/bin/v_change_sys_ip_owner b/bin/v_change_sys_ip_owner index c0007599b..4794b5bdf 100755 --- a/bin/v_change_sys_ip_owner +++ b/bin/v_change_sys_ip_owner @@ -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 diff --git a/bin/v_change_sys_ip_status b/bin/v_change_sys_ip_status index 1febe0f9b..ff0b3ae84 100755 --- a/bin/v_change_sys_ip_status +++ b/bin/v_change_sys_ip_status @@ -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 diff --git a/bin/v_change_sys_user_contact b/bin/v_change_sys_user_contact index b3b52f41b..800eebda2 100755 --- a/bin/v_change_sys_user_contact +++ b/bin/v_change_sys_user_contact @@ -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 diff --git a/bin/v_change_sys_user_name b/bin/v_change_sys_user_name index 88dbe2e86..f2e9298f6 100755 --- a/bin/v_change_sys_user_name +++ b/bin/v_change_sys_user_name @@ -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 diff --git a/bin/v_change_sys_user_ns b/bin/v_change_sys_user_ns index b432a86b9..78eebc009 100755 --- a/bin/v_change_sys_user_ns +++ b/bin/v_change_sys_user_ns @@ -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 diff --git a/bin/v_change_sys_user_package b/bin/v_change_sys_user_package index 9b7d8d503..533559db9 100755 --- a/bin/v_change_sys_user_package +++ b/bin/v_change_sys_user_package @@ -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 diff --git a/bin/v_change_sys_user_password b/bin/v_change_sys_user_password index bb86142c0..469100f8b 100755 --- a/bin/v_change_sys_user_password +++ b/bin/v_change_sys_user_password @@ -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 diff --git a/bin/v_change_sys_user_shell b/bin/v_change_sys_user_shell index dbaf3a6fd..6b7073496 100755 --- a/bin/v_change_sys_user_shell +++ b/bin/v_change_sys_user_shell @@ -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 diff --git a/bin/v_change_web_domain_ip b/bin/v_change_web_domain_ip index 7cdd90189..0b6406a6b 100755 --- a/bin/v_change_web_domain_ip +++ b/bin/v_change_web_domain_ip @@ -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 diff --git a/bin/v_change_web_domain_sslcert b/bin/v_change_web_domain_sslcert index da7bfb895..b3ba36cad 100755 --- a/bin/v_change_web_domain_sslcert +++ b/bin/v_change_web_domain_sslcert @@ -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 diff --git a/bin/v_change_web_domain_sslhome b/bin/v_change_web_domain_sslhome index 0e78b8165..ac6d36c96 100755 --- a/bin/v_change_web_domain_sslhome +++ b/bin/v_change_web_domain_sslhome @@ -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 diff --git a/bin/v_change_web_domain_tpl b/bin/v_change_web_domain_tpl index 51e95ea37..3418237ae 100755 --- a/bin/v_change_web_domain_tpl +++ b/bin/v_change_web_domain_tpl @@ -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 diff --git a/bin/v_del_db_base b/bin/v_del_db_base index 5d2a95791..cbe4b603e 100755 --- a/bin/v_del_db_base +++ b/bin/v_del_db_base @@ -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 diff --git a/bin/v_del_db_dbases b/bin/v_del_db_dbases index db8a389c9..394418a6e 100755 --- a/bin/v_del_db_dbases +++ b/bin/v_del_db_dbases @@ -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 diff --git a/bin/v_del_db_host b/bin/v_del_db_host index 77c1557ea..98976706b 100755 --- a/bin/v_del_db_host +++ b/bin/v_del_db_host @@ -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 diff --git a/bin/v_del_dns_domain b/bin/v_del_dns_domain index 09ecd7483..bc1ebb7f9 100755 --- a/bin/v_del_dns_domain +++ b/bin/v_del_dns_domain @@ -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 diff --git a/bin/v_del_dns_domain_record b/bin/v_del_dns_domain_record index 5a16a904d..e05c4bb6c 100755 --- a/bin/v_del_dns_domain_record +++ b/bin/v_del_dns_domain_record @@ -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 diff --git a/bin/v_del_dns_domains b/bin/v_del_dns_domains index 3d727303e..ce17695de 100755 --- a/bin/v_del_dns_domains +++ b/bin/v_del_dns_domains @@ -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 diff --git a/bin/v_del_ssl_certificate b/bin/v_del_ssl_certificate index 419cdeaf6..669a742c0 100755 --- a/bin/v_del_ssl_certificate +++ b/bin/v_del_ssl_certificate @@ -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 diff --git a/bin/v_del_sys_cron b/bin/v_del_sys_cron index e4654a0c2..8b6bb7fd3 100755 --- a/bin/v_del_sys_cron +++ b/bin/v_del_sys_cron @@ -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 diff --git a/bin/v_del_sys_ip b/bin/v_del_sys_ip index f1e97e6d6..61133016f 100755 --- a/bin/v_del_sys_ip +++ b/bin/v_del_sys_ip @@ -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 diff --git a/bin/v_del_sys_user b/bin/v_del_sys_user index 8013e85da..bf5c01b7e 100755 --- a/bin/v_del_sys_user +++ b/bin/v_del_sys_user @@ -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 diff --git a/bin/v_del_sys_user_reports b/bin/v_del_sys_user_reports index 0c35e1c35..042b84c9a 100755 --- a/bin/v_del_sys_user_reports +++ b/bin/v_del_sys_user_reports @@ -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 diff --git a/bin/v_del_web_domain b/bin/v_del_web_domain index 606f1817e..f7e1d6b7c 100755 --- a/bin/v_del_web_domain +++ b/bin/v_del_web_domain @@ -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 diff --git a/bin/v_del_web_domain_alias b/bin/v_del_web_domain_alias index 5e99ac6e5..b70e6d855 100755 --- a/bin/v_del_web_domain_alias +++ b/bin/v_del_web_domain_alias @@ -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 diff --git a/bin/v_del_web_domain_cgi b/bin/v_del_web_domain_cgi index a5c262058..71bbbffd7 100755 --- a/bin/v_del_web_domain_cgi +++ b/bin/v_del_web_domain_cgi @@ -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 diff --git a/bin/v_del_web_domain_elog b/bin/v_del_web_domain_elog index aec03d1df..e764ffa16 100755 --- a/bin/v_del_web_domain_elog +++ b/bin/v_del_web_domain_elog @@ -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 diff --git a/bin/v_del_web_domain_nginx b/bin/v_del_web_domain_nginx index 0fb3ff12f..21e6c32dc 100755 --- a/bin/v_del_web_domain_nginx +++ b/bin/v_del_web_domain_nginx @@ -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 diff --git a/bin/v_del_web_domain_ssl b/bin/v_del_web_domain_ssl index c8e411d35..d6d4b327f 100755 --- a/bin/v_del_web_domain_ssl +++ b/bin/v_del_web_domain_ssl @@ -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 diff --git a/bin/v_del_web_domain_stat b/bin/v_del_web_domain_stat index bf3fbc61f..b242c6c8d 100755 --- a/bin/v_del_web_domain_stat +++ b/bin/v_del_web_domain_stat @@ -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 diff --git a/bin/v_del_web_domain_stat_auth b/bin/v_del_web_domain_stat_auth index 1dbd8b8b6..6900fedb2 100755 --- a/bin/v_del_web_domain_stat_auth +++ b/bin/v_del_web_domain_stat_auth @@ -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 diff --git a/bin/v_del_web_domains b/bin/v_del_web_domains index 7a09de46a..4585ed169 100755 --- a/bin/v_del_web_domains +++ b/bin/v_del_web_domains @@ -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 diff --git a/bin/v_get_dns_domain_value b/bin/v_get_dns_domain_value index 6772f1bc7..499f04030 100755 --- a/bin/v_get_dns_domain_value +++ b/bin/v_get_dns_domain_value @@ -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 diff --git a/bin/v_get_sys_user_value b/bin/v_get_sys_user_value index d583545f0..20b2a1a3f 100755 --- a/bin/v_get_sys_user_value +++ b/bin/v_get_sys_user_value @@ -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 diff --git a/bin/v_get_web_domain_value b/bin/v_get_web_domain_value index d409f07dd..8a084c5c7 100755 --- a/bin/v_get_web_domain_value +++ b/bin/v_get_web_domain_value @@ -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 diff --git a/bin/v_rebuild_dns_domains b/bin/v_rebuild_dns_domains index c2bcef3ca..ba4065785 100755 --- a/bin/v_rebuild_dns_domains +++ b/bin/v_rebuild_dns_domains @@ -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 diff --git a/bin/v_rebuild_sys_cron b/bin/v_rebuild_sys_cron index 578415ab4..c81fb36b3 100755 --- a/bin/v_rebuild_sys_cron +++ b/bin/v_rebuild_sys_cron @@ -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 diff --git a/bin/v_rebuild_web_domains b/bin/v_rebuild_web_domains index 5caaf2d3a..ee07cb849 100755 --- a/bin/v_rebuild_web_domains +++ b/bin/v_rebuild_web_domains @@ -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 diff --git a/bin/v_suspend_db_base b/bin/v_suspend_db_base index 7f4e8641b..c6964930a 100755 --- a/bin/v_suspend_db_base +++ b/bin/v_suspend_db_base @@ -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 diff --git a/bin/v_suspend_db_bases b/bin/v_suspend_db_bases index 3b1878fdc..db3ed3d5d 100755 --- a/bin/v_suspend_db_bases +++ b/bin/v_suspend_db_bases @@ -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 diff --git a/bin/v_suspend_dns_domain b/bin/v_suspend_dns_domain index b977f3ca9..460ce07e9 100755 --- a/bin/v_suspend_dns_domain +++ b/bin/v_suspend_dns_domain @@ -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 diff --git a/bin/v_suspend_dns_domains b/bin/v_suspend_dns_domains index d1f65de97..44cbc84bc 100755 --- a/bin/v_suspend_dns_domains +++ b/bin/v_suspend_dns_domains @@ -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 diff --git a/bin/v_suspend_sys_cron_job b/bin/v_suspend_sys_cron_job index ca9e41357..153cc2da8 100755 --- a/bin/v_suspend_sys_cron_job +++ b/bin/v_suspend_sys_cron_job @@ -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 diff --git a/bin/v_suspend_sys_cron_jobs b/bin/v_suspend_sys_cron_jobs index 099e2f86f..9af942993 100755 --- a/bin/v_suspend_sys_cron_jobs +++ b/bin/v_suspend_sys_cron_jobs @@ -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 diff --git a/bin/v_suspend_web_domain b/bin/v_suspend_web_domain index 7694a24fc..836d2a2be 100755 --- a/bin/v_suspend_web_domain +++ b/bin/v_suspend_web_domain @@ -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 diff --git a/bin/v_suspend_web_domains b/bin/v_suspend_web_domains index 70e507467..d5a2a20d2 100755 --- a/bin/v_suspend_web_domains +++ b/bin/v_suspend_web_domains @@ -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 diff --git a/bin/v_unsuspend_db_base b/bin/v_unsuspend_db_base index 91e9b29cc..5c88677a1 100755 --- a/bin/v_unsuspend_db_base +++ b/bin/v_unsuspend_db_base @@ -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 diff --git a/bin/v_unsuspend_db_bases b/bin/v_unsuspend_db_bases index b9e041dbc..85487e8bf 100755 --- a/bin/v_unsuspend_db_bases +++ b/bin/v_unsuspend_db_bases @@ -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 diff --git a/bin/v_unsuspend_dns_domain b/bin/v_unsuspend_dns_domain index 58e6e4dab..664793894 100755 --- a/bin/v_unsuspend_dns_domain +++ b/bin/v_unsuspend_dns_domain @@ -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 diff --git a/bin/v_unsuspend_dns_domains b/bin/v_unsuspend_dns_domains index f427868a9..373bd3f16 100755 --- a/bin/v_unsuspend_dns_domains +++ b/bin/v_unsuspend_dns_domains @@ -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 diff --git a/bin/v_unsuspend_sys_cron_job b/bin/v_unsuspend_sys_cron_job index 387a2dc0e..c110af1b5 100755 --- a/bin/v_unsuspend_sys_cron_job +++ b/bin/v_unsuspend_sys_cron_job @@ -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 diff --git a/bin/v_unsuspend_sys_cron_jobs b/bin/v_unsuspend_sys_cron_jobs index 6e7437e74..09c2657cc 100755 --- a/bin/v_unsuspend_sys_cron_jobs +++ b/bin/v_unsuspend_sys_cron_jobs @@ -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 diff --git a/bin/v_unsuspend_web_domain b/bin/v_unsuspend_web_domain index 300611dce..f997eacc2 100755 --- a/bin/v_unsuspend_web_domain +++ b/bin/v_unsuspend_web_domain @@ -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 diff --git a/bin/v_unsuspend_web_domains b/bin/v_unsuspend_web_domains index ff3b52341..83a772890 100755 --- a/bin/v_unsuspend_web_domains +++ b/bin/v_unsuspend_web_domains @@ -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 diff --git a/bin/v_upd_db_base_disk b/bin/v_upd_db_base_disk index faeabc419..ee5244581 100755 --- a/bin/v_upd_db_base_disk +++ b/bin/v_upd_db_base_disk @@ -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 diff --git a/bin/v_upd_db_bases_disk b/bin/v_upd_db_bases_disk index 207afea38..587c4a8c9 100755 --- a/bin/v_upd_db_bases_disk +++ b/bin/v_upd_db_bases_disk @@ -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 diff --git a/bin/v_upd_sys_ip b/bin/v_upd_sys_ip index d9fab6e66..a67b3e7b1 100755 --- a/bin/v_upd_sys_ip +++ b/bin/v_upd_sys_ip @@ -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 diff --git a/bin/v_upd_sys_queue b/bin/v_upd_sys_queue index 85bf8db77..2f0d861a2 100755 --- a/bin/v_upd_sys_queue +++ b/bin/v_upd_sys_queue @@ -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 diff --git a/bin/v_upd_sys_rrd b/bin/v_upd_sys_rrd index 542d34d89..693388366 100755 --- a/bin/v_upd_sys_rrd +++ b/bin/v_upd_sys_rrd @@ -63,4 +63,4 @@ fi # Logging log_event 'system' "$V_EVENT" -exit $OK +exit diff --git a/bin/v_upd_sys_rrd_ftp b/bin/v_upd_sys_rrd_ftp index c66fa1338..d6873ca94 100755 --- a/bin/v_upd_sys_rrd_ftp +++ b/bin/v_upd_sys_rrd_ftp @@ -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 diff --git a/bin/v_upd_sys_rrd_httpd b/bin/v_upd_sys_rrd_httpd index 365e90339..7429d4115 100755 --- a/bin/v_upd_sys_rrd_httpd +++ b/bin/v_upd_sys_rrd_httpd @@ -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 diff --git a/bin/v_upd_sys_rrd_la b/bin/v_upd_sys_rrd_la index 55d6dd58d..17a56f0f8 100755 --- a/bin/v_upd_sys_rrd_la +++ b/bin/v_upd_sys_rrd_la @@ -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 diff --git a/bin/v_upd_sys_rrd_mem b/bin/v_upd_sys_rrd_mem index 1d65476ac..6d39ee888 100755 --- a/bin/v_upd_sys_rrd_mem +++ b/bin/v_upd_sys_rrd_mem @@ -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 diff --git a/bin/v_upd_sys_rrd_mysql b/bin/v_upd_sys_rrd_mysql index 9a5e6de88..98e3ea26a 100755 --- a/bin/v_upd_sys_rrd_mysql +++ b/bin/v_upd_sys_rrd_mysql @@ -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 diff --git a/bin/v_upd_sys_rrd_net b/bin/v_upd_sys_rrd_net index 5abb1b0c7..64af1e29b 100755 --- a/bin/v_upd_sys_rrd_net +++ b/bin/v_upd_sys_rrd_net @@ -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 diff --git a/bin/v_upd_sys_rrd_nginx b/bin/v_upd_sys_rrd_nginx index cd6a625ad..36ee58760 100755 --- a/bin/v_upd_sys_rrd_nginx +++ b/bin/v_upd_sys_rrd_nginx @@ -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 diff --git a/bin/v_upd_sys_rrd_pgsql b/bin/v_upd_sys_rrd_pgsql index bcddda109..7fb5ce2a0 100755 --- a/bin/v_upd_sys_rrd_pgsql +++ b/bin/v_upd_sys_rrd_pgsql @@ -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 diff --git a/bin/v_upd_sys_rrd_ssh b/bin/v_upd_sys_rrd_ssh index 99ea8d2fb..6c61ba944 100755 --- a/bin/v_upd_sys_rrd_ssh +++ b/bin/v_upd_sys_rrd_ssh @@ -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 diff --git a/bin/v_upd_sys_user_bill b/bin/v_upd_sys_user_bill index be9620def..a0d34c9aa 100755 --- a/bin/v_upd_sys_user_bill +++ b/bin/v_upd_sys_user_bill @@ -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 diff --git a/bin/v_upd_sys_user_disk b/bin/v_upd_sys_user_disk index 86c65db63..53ec7f8aa 100755 --- a/bin/v_upd_sys_user_disk +++ b/bin/v_upd_sys_user_disk @@ -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 diff --git a/bin/v_upd_sys_vesta b/bin/v_upd_sys_vesta index 6fe988aeb..d6ea3e300 100755 --- a/bin/v_upd_sys_vesta +++ b/bin/v_upd_sys_vesta @@ -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 diff --git a/bin/v_upd_web_domain_disk b/bin/v_upd_web_domain_disk index a05b345bb..d69c15893 100755 --- a/bin/v_upd_web_domain_disk +++ b/bin/v_upd_web_domain_disk @@ -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 diff --git a/bin/v_upd_web_domain_stat b/bin/v_upd_web_domain_stat index e336d9809..9016b4b52 100755 --- a/bin/v_upd_web_domain_stat +++ b/bin/v_upd_web_domain_stat @@ -6,7 +6,7 @@ #----------------------------------------------------------# # Argument defenition -user="$1" +user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") @@ -128,4 +128,4 @@ chown -R $user:$(groups $user| cut -f 3 -d ' ') $dir # Logging log_event 'system' "$V_EVENT" -exit $OK +exit diff --git a/bin/v_upd_web_domain_traff b/bin/v_upd_web_domain_traff index 3292d40da..25c90867a 100755 --- a/bin/v_upd_web_domain_traff +++ b/bin/v_upd_web_domain_traff @@ -6,7 +6,7 @@ #----------------------------------------------------------# # Argument defenition -user="$1" +user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") @@ -81,4 +81,4 @@ update_web_domain_value '$U_BANDWIDTH' "$bandwidth" # Logging log_event 'system' "$V_EVENT" -exit $OK +exit diff --git a/bin/v_upd_web_domains_disk b/bin/v_upd_web_domains_disk index 6f10d9758..a05542bd6 100755 --- a/bin/v_upd_web_domains_disk +++ b/bin/v_upd_web_domains_disk @@ -6,7 +6,7 @@ #----------------------------------------------------------# # Argument defenition -user="$1" +user=$1 # Importing variables source $VESTA/conf/vars.conf @@ -74,4 +74,4 @@ update_user_value "$user" '$U_DISK' "$disk_size" # Logging log_event 'system' "$V_EVENT" -exit $OK +exit diff --git a/bin/v_upd_web_domains_stat b/bin/v_upd_web_domains_stat index 0b369bf2d..022b14a98 100755 --- a/bin/v_upd_web_domains_stat +++ b/bin/v_upd_web_domains_stat @@ -6,7 +6,7 @@ #----------------------------------------------------------# # Argument defenition -user="$1" +user=$1 # Importing variables source $VESTA/conf/vars.conf @@ -67,4 +67,4 @@ done # Logging log_event 'system' "$V_EVENT" -exit $OK +exit diff --git a/bin/v_upd_web_domains_traff b/bin/v_upd_web_domains_traff index eb0349e09..68df310d4 100755 --- a/bin/v_upd_web_domains_traff +++ b/bin/v_upd_web_domains_traff @@ -6,7 +6,7 @@ #----------------------------------------------------------# # Argument defenition -user="$1" +user=$1 # Importing variables source $VESTA/conf/vars.conf @@ -92,4 +92,4 @@ update_user_value "$user" '$U_BANDWIDTH' "$traff_size" # Logging log_event 'system' "$V_EVENT" -exit $OK +exit