From eef6d4df740cf80fc75596c881233edf52d4f552 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 1 Nov 2011 13:02:44 +0200 Subject: [PATCH] ranmed internal functions --- bin/v_add_db_base | 4 +- bin/v_add_db_host | 4 +- bin/v_add_dns_domain | 4 +- bin/v_add_dns_domain_record | 4 +- bin/v_add_ssl_certificate | 4 +- bin/v_add_sys_cron | 4 +- bin/v_add_sys_ip | 6 +-- bin/v_add_sys_user | 2 +- 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 | 4 +- bin/v_add_web_domain_ssl | 6 +-- bin/v_add_web_domain_stat | 4 +- bin/v_add_web_domain_stat_auth | 4 +- bin/v_backup_sys_user | 6 +-- bin/v_backup_sys_users | 2 +- bin/v_change_db_password | 4 +- bin/v_change_dns_domain_exp | 4 +- bin/v_change_dns_domain_ip | 4 +- bin/v_change_dns_domain_record | 4 +- bin/v_change_dns_domain_soa | 4 +- bin/v_change_dns_domain_tpl | 4 +- bin/v_change_dns_domain_ttl | 4 +- bin/v_change_sys_cron_job | 4 +- bin/v_change_sys_ip_name | 4 +- bin/v_change_sys_ip_owner | 4 +- bin/v_change_sys_ip_status | 4 +- bin/v_change_sys_user_contact | 2 +- bin/v_change_sys_user_name | 2 +- bin/v_change_sys_user_ns | 2 +- bin/v_change_sys_user_package | 2 +- bin/v_change_sys_user_password | 2 +- bin/v_change_sys_user_shell | 2 +- bin/v_change_web_domain_ip | 6 +-- bin/v_change_web_domain_sslcert | 4 +- bin/v_change_web_domain_sslhome | 4 +- bin/v_change_web_domain_tpl | 4 +- bin/v_del_db_base | 4 +- bin/v_del_db_dbases | 4 +- bin/v_del_db_host | 4 +- bin/v_del_dns_domain | 4 +- bin/v_del_dns_domain_record | 4 +- bin/v_del_dns_domains | 4 +- bin/v_del_ssl_certificate | 4 +- bin/v_del_sys_cron | 4 +- bin/v_del_sys_ip | 6 +-- bin/v_del_sys_user | 8 ++-- bin/v_del_sys_user_reports | 4 +- bin/v_del_web_domain | 6 +-- 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 | 4 +- bin/v_del_web_domains | 4 +- bin/v_get_dns_domain_value | 4 +- bin/v_get_sys_user_value | 2 +- bin/v_get_web_domain_value | 4 +- bin/v_list_db_base | 4 +- bin/v_list_db_bases | 2 +- bin/v_list_db_host | 4 +- bin/v_list_db_hosts | 2 +- bin/v_list_dns_domain | 4 +- bin/v_list_dns_domains | 2 +- bin/v_list_dns_template | 4 +- bin/v_list_dns_templates | 2 +- bin/v_list_ssl_certificates | 2 +- bin/v_list_sys_cron | 2 +- bin/v_list_sys_interfaces | 2 +- bin/v_list_sys_ip | 4 +- bin/v_list_sys_ips | 2 +- bin/v_list_sys_user | 2 +- bin/v_list_sys_user_ips | 2 +- bin/v_list_sys_user_ns | 2 +- bin/v_list_sys_user_packages | 2 +- bin/v_list_sys_users | 2 +- bin/v_list_web_domain | 4 +- bin/v_list_web_domains | 2 +- bin/v_list_web_domains_alias | 2 +- bin/v_list_web_domains_elog | 2 +- bin/v_list_web_domains_nginx | 2 +- bin/v_list_web_domains_ssl | 2 +- bin/v_list_web_domains_stats | 2 +- bin/v_list_web_templates | 2 +- bin/v_rebuild_dns_domains | 6 +-- bin/v_rebuild_sys_cron | 4 +- bin/v_rebuild_web_domains | 6 +-- func/restart_cron => bin/v_restart_cron | 0 func/restart_dns => bin/v_restart_dns | 8 ++-- func/restart_web => bin/v_restart_web | 0 bin/v_suspend_db_base | 4 +- bin/v_suspend_db_bases | 4 +- bin/v_suspend_dns_domain | 4 +- bin/v_suspend_dns_domains | 4 +- bin/v_suspend_sys_cron_job | 4 +- bin/v_suspend_sys_cron_jobs | 4 +- bin/v_suspend_web_domain | 4 +- bin/v_suspend_web_domains | 4 +- bin/v_unsuspend_db_base | 4 +- bin/v_unsuspend_db_bases | 4 +- bin/v_unsuspend_dns_domain | 4 +- bin/v_unsuspend_dns_domains | 4 +- bin/v_unsuspend_sys_cron_job | 4 +- 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 | 4 +- bin/v_upd_db_bases_disk | 4 +- bin/v_upd_sys_ip | 6 +-- bin/v_upd_sys_queue | 59 ++++++++++++------------- bin/v_upd_sys_rrd | 2 +- bin/v_upd_sys_rrd_httpd | 4 +- bin/v_upd_sys_rrd_mysql | 4 +- bin/v_upd_sys_rrd_pgsql | 4 +- bin/v_upd_sys_user_bill | 4 +- bin/v_upd_sys_user_disk | 2 +- bin/v_upd_sys_vesta | 2 +- 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 +- func/{cert_func.sh => cert.func} | 0 func/{cron_func.sh => cron.func} | 0 func/{db_func.sh => db.func} | 0 func/{domain_func.sh => domain.func} | 0 func/{ip_func.sh => ip.func} | 0 func/{shared_func.sh => shared.func} | 0 134 files changed, 260 insertions(+), 263 deletions(-) rename func/restart_cron => bin/v_restart_cron (100%) rename func/restart_dns => bin/v_restart_dns (57%) rename func/restart_web => bin/v_restart_web (100%) rename func/{cert_func.sh => cert.func} (100%) rename func/{cron_func.sh => cron.func} (100%) rename func/{db_func.sh => db.func} (100%) rename func/{domain_func.sh => domain.func} (100%) rename func/{ip_func.sh => ip.func} (100%) rename func/{shared_func.sh => shared.func} (100%) diff --git a/bin/v_add_db_base b/bin/v_add_db_base index 12344c6d6..617a64e1c 100755 --- a/bin/v_add_db_base +++ b/bin/v_add_db_base @@ -16,8 +16,8 @@ encoding=${7-UTF8} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_add_db_host b/bin/v_add_db_host index c0b849bb8..d2993c877 100755 --- a/bin/v_add_db_host +++ b/bin/v_add_db_host @@ -18,8 +18,8 @@ template=${8-template1} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_add_dns_domain b/bin/v_add_dns_domain index a96d26f50..28fb4da1a 100755 --- a/bin/v_add_dns_domain +++ b/bin/v_add_dns_domain @@ -18,8 +18,8 @@ ttl=${7-14400} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_add_dns_domain_record b/bin/v_add_dns_domain_record index e1e512119..df9b644b2 100755 --- a/bin/v_add_dns_domain_record +++ b/bin/v_add_dns_domain_record @@ -16,8 +16,8 @@ id=$6 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_add_ssl_certificate b/bin/v_add_ssl_certificate index b9c8a89f5..1c87da5db 100755 --- a/bin/v_add_ssl_certificate +++ b/bin/v_add_ssl_certificate @@ -11,8 +11,8 @@ cert=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cert_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cert.func #----------------------------------------------------------# # Verifications # diff --git a/bin/v_add_sys_cron b/bin/v_add_sys_cron index 58c969599..37a19d3c3 100755 --- a/bin/v_add_sys_cron +++ b/bin/v_add_sys_cron @@ -17,8 +17,8 @@ job=$8 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cron_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cron.func #----------------------------------------------------------# diff --git a/bin/v_add_sys_ip b/bin/v_add_sys_ip index 7320c99f4..3c46a3f01 100755 --- a/bin/v_add_sys_ip +++ b/bin/v_add_sys_ip @@ -15,9 +15,9 @@ ip_name=$6 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/ip_func.sh -source $V_FUNC/domain_func.sh # for namehosting +source $V_FUNC/shared.func +source $V_FUNC/ip.func +source $V_FUNC/domain.func # for namehosting #----------------------------------------------------------# # Verifications # diff --git a/bin/v_add_sys_user b/bin/v_add_sys_user index 74fa2950a..5a2ccfd84 100755 --- a/bin/v_add_sys_user +++ b/bin/v_add_sys_user @@ -15,7 +15,7 @@ lname=$6 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_add_sys_user_reports b/bin/v_add_sys_user_reports index ad234eb4d..a6babc403 100755 --- a/bin/v_add_sys_user_reports +++ b/bin/v_add_sys_user_reports @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cron_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cron.func #----------------------------------------------------------# diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain index bcd8e77b6..7870441c2 100755 --- a/bin/v_add_web_domain +++ b/bin/v_add_web_domain @@ -14,9 +14,9 @@ template=${4-default} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func +source $V_FUNC/ip.func #----------------------------------------------------------# diff --git a/bin/v_add_web_domain_alias b/bin/v_add_web_domain_alias index f45c4b172..5b07fd7bc 100755 --- a/bin/v_add_web_domain_alias +++ b/bin/v_add_web_domain_alias @@ -14,8 +14,8 @@ dom_alias_idn=$(idn -t --quiet -a "$dom_alias" ) # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_add_web_domain_cgi b/bin/v_add_web_domain_cgi index 6f3be33db..37b828f8f 100755 --- a/bin/v_add_web_domain_cgi +++ b/bin/v_add_web_domain_cgi @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_add_web_domain_elog b/bin/v_add_web_domain_elog index ddca5e67b..38ed3e1db 100755 --- a/bin/v_add_web_domain_elog +++ b/bin/v_add_web_domain_elog @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_add_web_domain_nginx b/bin/v_add_web_domain_nginx index e32ce0a4a..8f081f569 100755 --- a/bin/v_add_web_domain_nginx +++ b/bin/v_add_web_domain_nginx @@ -16,8 +16,8 @@ extentions=${4-$default_extentions} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_add_web_domain_ssl b/bin/v_add_web_domain_ssl index 89cc118e9..08ddf9501 100755 --- a/bin/v_add_web_domain_ssl +++ b/bin/v_add_web_domain_ssl @@ -14,9 +14,9 @@ tpl_option=${4-single} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func +source $V_FUNC/ip.func #----------------------------------------------------------# diff --git a/bin/v_add_web_domain_stat b/bin/v_add_web_domain_stat index ad8ba384a..9e4a0f5b9 100755 --- a/bin/v_add_web_domain_stat +++ b/bin/v_add_web_domain_stat @@ -13,8 +13,8 @@ type=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_add_web_domain_stat_auth b/bin/v_add_web_domain_stat_auth index 02b9e6a52..238dacbb7 100755 --- a/bin/v_add_web_domain_stat_auth +++ b/bin/v_add_web_domain_stat_auth @@ -13,8 +13,8 @@ auth_pass=$4 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_backup_sys_user b/bin/v_backup_sys_user index 59576d406..bad91216c 100755 --- a/bin/v_backup_sys_user +++ b/bin/v_backup_sys_user @@ -11,9 +11,9 @@ output=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func +source $V_FUNC/db.func source $V_CONF/vesta.conf diff --git a/bin/v_backup_sys_users b/bin/v_backup_sys_users index 342f61aaa..877b0044c 100755 --- a/bin/v_backup_sys_users +++ b/bin/v_backup_sys_users @@ -12,7 +12,7 @@ source /etc/profile.d/vesta.sh # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_change_db_password b/bin/v_change_db_password index f1767f6ae..1b7503893 100755 --- a/bin/v_change_db_password +++ b/bin/v_change_db_password @@ -12,8 +12,8 @@ db_password=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_change_dns_domain_exp b/bin/v_change_dns_domain_exp index 6432c51c8..48cd5093c 100755 --- a/bin/v_change_dns_domain_exp +++ b/bin/v_change_dns_domain_exp @@ -13,8 +13,8 @@ exp=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_change_dns_domain_ip b/bin/v_change_dns_domain_ip index dcbbcc0ed..201b4e5a3 100755 --- a/bin/v_change_dns_domain_ip +++ b/bin/v_change_dns_domain_ip @@ -13,8 +13,8 @@ ip=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# # Verifications # diff --git a/bin/v_change_dns_domain_record b/bin/v_change_dns_domain_record index 3a2017b84..f91f24306 100755 --- a/bin/v_change_dns_domain_record +++ b/bin/v_change_dns_domain_record @@ -16,8 +16,8 @@ value=$(idn -t --quiet -u "$6" ) # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_change_dns_domain_soa b/bin/v_change_dns_domain_soa index 0024172ff..03fc313e0 100755 --- a/bin/v_change_dns_domain_soa +++ b/bin/v_change_dns_domain_soa @@ -13,8 +13,8 @@ soa=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# # Verifications # diff --git a/bin/v_change_dns_domain_tpl b/bin/v_change_dns_domain_tpl index 5c2f97c61..7ffc5ab19 100755 --- a/bin/v_change_dns_domain_tpl +++ b/bin/v_change_dns_domain_tpl @@ -13,8 +13,8 @@ template=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_change_dns_domain_ttl b/bin/v_change_dns_domain_ttl index 7d7d7361e..08adb2887 100755 --- a/bin/v_change_dns_domain_ttl +++ b/bin/v_change_dns_domain_ttl @@ -13,8 +13,8 @@ ttl=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_change_sys_cron_job b/bin/v_change_sys_cron_job index e4079a020..41ac3a529 100755 --- a/bin/v_change_sys_cron_job +++ b/bin/v_change_sys_cron_job @@ -17,8 +17,8 @@ command=$8 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cron_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cron.func #----------------------------------------------------------# diff --git a/bin/v_change_sys_ip_name b/bin/v_change_sys_ip_name index f25222cc4..4694ddee3 100755 --- a/bin/v_change_sys_ip_name +++ b/bin/v_change_sys_ip_name @@ -11,8 +11,8 @@ ip_name=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/ip.func #----------------------------------------------------------# diff --git a/bin/v_change_sys_ip_owner b/bin/v_change_sys_ip_owner index 4794b5bdf..003611d70 100755 --- a/bin/v_change_sys_ip_owner +++ b/bin/v_change_sys_ip_owner @@ -11,8 +11,8 @@ ip=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/ip.func #----------------------------------------------------------# diff --git a/bin/v_change_sys_ip_status b/bin/v_change_sys_ip_status index ff0b3ae84..b6947fbb1 100755 --- a/bin/v_change_sys_ip_status +++ b/bin/v_change_sys_ip_status @@ -11,8 +11,8 @@ ip_status=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/ip.func #----------------------------------------------------------# diff --git a/bin/v_change_sys_user_contact b/bin/v_change_sys_user_contact index 800eebda2..d12e13662 100755 --- a/bin/v_change_sys_user_contact +++ b/bin/v_change_sys_user_contact @@ -11,7 +11,7 @@ email=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# # Verifications # diff --git a/bin/v_change_sys_user_name b/bin/v_change_sys_user_name index f2e9298f6..9a51fad70 100755 --- a/bin/v_change_sys_user_name +++ b/bin/v_change_sys_user_name @@ -12,7 +12,7 @@ lname=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_change_sys_user_ns b/bin/v_change_sys_user_ns index 78eebc009..ccffbc743 100755 --- a/bin/v_change_sys_user_ns +++ b/bin/v_change_sys_user_ns @@ -18,7 +18,7 @@ ns8=$9 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_change_sys_user_package b/bin/v_change_sys_user_package index 533559db9..06d26f5f5 100755 --- a/bin/v_change_sys_user_package +++ b/bin/v_change_sys_user_package @@ -11,7 +11,7 @@ package=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_change_sys_user_password b/bin/v_change_sys_user_password index 469100f8b..4f09985a6 100755 --- a/bin/v_change_sys_user_password +++ b/bin/v_change_sys_user_password @@ -11,7 +11,7 @@ password=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_change_sys_user_shell b/bin/v_change_sys_user_shell index 6b7073496..f7687355d 100755 --- a/bin/v_change_sys_user_shell +++ b/bin/v_change_sys_user_shell @@ -11,7 +11,7 @@ shell=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_change_web_domain_ip b/bin/v_change_web_domain_ip index 0b6406a6b..8743d4225 100755 --- a/bin/v_change_web_domain_ip +++ b/bin/v_change_web_domain_ip @@ -13,9 +13,9 @@ ip=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func +source $V_FUNC/ip.func #----------------------------------------------------------# diff --git a/bin/v_change_web_domain_sslcert b/bin/v_change_web_domain_sslcert index b3ba36cad..c60a59533 100755 --- a/bin/v_change_web_domain_sslcert +++ b/bin/v_change_web_domain_sslcert @@ -13,8 +13,8 @@ certificate=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_change_web_domain_sslhome b/bin/v_change_web_domain_sslhome index ac6d36c96..916a4fb46 100755 --- a/bin/v_change_web_domain_sslhome +++ b/bin/v_change_web_domain_sslhome @@ -13,8 +13,8 @@ tpl_option=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_change_web_domain_tpl b/bin/v_change_web_domain_tpl index 3418237ae..9cf8075b6 100755 --- a/bin/v_change_web_domain_tpl +++ b/bin/v_change_web_domain_tpl @@ -13,8 +13,8 @@ template=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_db_base b/bin/v_del_db_base index cbe4b603e..2608ba100 100755 --- a/bin/v_del_db_base +++ b/bin/v_del_db_base @@ -11,8 +11,8 @@ database=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_del_db_dbases b/bin/v_del_db_dbases index 394418a6e..52ae62094 100755 --- a/bin/v_del_db_dbases +++ b/bin/v_del_db_dbases @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_del_db_host b/bin/v_del_db_host index 98976706b..33c1a7606 100755 --- a/bin/v_del_db_host +++ b/bin/v_del_db_host @@ -11,8 +11,8 @@ host=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_del_dns_domain b/bin/v_del_dns_domain index bc1ebb7f9..baedc2783 100755 --- a/bin/v_del_dns_domain +++ b/bin/v_del_dns_domain @@ -12,8 +12,8 @@ named_conf=/etc/named.conf # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_dns_domain_record b/bin/v_del_dns_domain_record index e05c4bb6c..92726cbee 100755 --- a/bin/v_del_dns_domain_record +++ b/bin/v_del_dns_domain_record @@ -13,8 +13,8 @@ id=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_dns_domains b/bin/v_del_dns_domains index ce17695de..4d79b1f5b 100755 --- a/bin/v_del_dns_domains +++ b/bin/v_del_dns_domains @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_ssl_certificate b/bin/v_del_ssl_certificate index 669a742c0..82938c31b 100755 --- a/bin/v_del_ssl_certificate +++ b/bin/v_del_ssl_certificate @@ -11,8 +11,8 @@ cert=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cert_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cert.func #----------------------------------------------------------# diff --git a/bin/v_del_sys_cron b/bin/v_del_sys_cron index 8b6bb7fd3..9e9a1ba5f 100755 --- a/bin/v_del_sys_cron +++ b/bin/v_del_sys_cron @@ -11,8 +11,8 @@ job=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cron_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cron.func #----------------------------------------------------------# diff --git a/bin/v_del_sys_ip b/bin/v_del_sys_ip index 61133016f..7d221f414 100755 --- a/bin/v_del_sys_ip +++ b/bin/v_del_sys_ip @@ -10,9 +10,9 @@ ip=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/ip_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/ip.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_sys_user b/bin/v_del_sys_user index bf5c01b7e..18195d149 100755 --- a/bin/v_del_sys_user +++ b/bin/v_del_sys_user @@ -10,10 +10,10 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh -source $V_FUNC/db_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func +source $V_FUNC/db.func +source $V_FUNC/ip.func source $V_CONF/vesta.conf diff --git a/bin/v_del_sys_user_reports b/bin/v_del_sys_user_reports index 042b84c9a..b04b6cd00 100755 --- a/bin/v_del_sys_user_reports +++ b/bin/v_del_sys_user_reports @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cron_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cron.func #----------------------------------------------------------# diff --git a/bin/v_del_web_domain b/bin/v_del_web_domain index f7e1d6b7c..051b5baa8 100755 --- a/bin/v_del_web_domain +++ b/bin/v_del_web_domain @@ -12,9 +12,9 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func +source $V_FUNC/ip.func #----------------------------------------------------------# diff --git a/bin/v_del_web_domain_alias b/bin/v_del_web_domain_alias index b70e6d855..188b06ebb 100755 --- a/bin/v_del_web_domain_alias +++ b/bin/v_del_web_domain_alias @@ -14,8 +14,8 @@ dom_alias_idn=$(idn -t --quiet -a "$dom_alias" ) # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_web_domain_cgi b/bin/v_del_web_domain_cgi index 71bbbffd7..4d1fe6470 100755 --- a/bin/v_del_web_domain_cgi +++ b/bin/v_del_web_domain_cgi @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_web_domain_elog b/bin/v_del_web_domain_elog index e764ffa16..5a7405fdc 100755 --- a/bin/v_del_web_domain_elog +++ b/bin/v_del_web_domain_elog @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_web_domain_nginx b/bin/v_del_web_domain_nginx index 21e6c32dc..bbc179d7e 100755 --- a/bin/v_del_web_domain_nginx +++ b/bin/v_del_web_domain_nginx @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_web_domain_ssl b/bin/v_del_web_domain_ssl index d6d4b327f..c0fe7ffc9 100755 --- a/bin/v_del_web_domain_ssl +++ b/bin/v_del_web_domain_ssl @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_web_domain_stat b/bin/v_del_web_domain_stat index b242c6c8d..d8e6594dd 100755 --- a/bin/v_del_web_domain_stat +++ b/bin/v_del_web_domain_stat @@ -11,8 +11,8 @@ domain=$(idn -t --quiet -u "$2" ) # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_web_domain_stat_auth b/bin/v_del_web_domain_stat_auth index 6900fedb2..b32a95573 100755 --- a/bin/v_del_web_domain_stat_auth +++ b/bin/v_del_web_domain_stat_auth @@ -12,8 +12,8 @@ auth_user=$3 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_del_web_domains b/bin/v_del_web_domains index 4585ed169..be496f8db 100755 --- a/bin/v_del_web_domains +++ b/bin/v_del_web_domains @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_get_dns_domain_value b/bin/v_get_dns_domain_value index 499f04030..06316eb7f 100755 --- a/bin/v_get_dns_domain_value +++ b/bin/v_get_dns_domain_value @@ -13,8 +13,8 @@ key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_get_sys_user_value b/bin/v_get_sys_user_value index 20b2a1a3f..3e5a255b2 100755 --- a/bin/v_get_sys_user_value +++ b/bin/v_get_sys_user_value @@ -11,7 +11,7 @@ key=$(echo "$2"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_get_web_domain_value b/bin/v_get_web_domain_value index 8a084c5c7..b2745842f 100755 --- a/bin/v_get_web_domain_value +++ b/bin/v_get_web_domain_value @@ -13,8 +13,8 @@ key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_list_db_base b/bin/v_list_db_base index 2fd86feea..5d507d670 100755 --- a/bin/v_list_db_base +++ b/bin/v_list_db_base @@ -12,8 +12,8 @@ format=${3-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func # Json function json_list_db() { diff --git a/bin/v_list_db_bases b/bin/v_list_db_bases index a8ba32728..6e0bc3ab0 100755 --- a/bin/v_list_db_bases +++ b/bin/v_list_db_bases @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_list_db_host b/bin/v_list_db_host index 6fd894173..98f27d5b5 100755 --- a/bin/v_list_db_host +++ b/bin/v_list_db_host @@ -12,8 +12,8 @@ format=${3-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func # Json function json_list_dbhost() { diff --git a/bin/v_list_db_hosts b/bin/v_list_db_hosts index b69ff890d..72ffd65ab 100755 --- a/bin/v_list_db_hosts +++ b/bin/v_list_db_hosts @@ -12,7 +12,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_list_dns_domain b/bin/v_list_dns_domain index f4acd8904..74bdb8997 100755 --- a/bin/v_list_dns_domain +++ b/bin/v_list_dns_domain @@ -12,8 +12,8 @@ format=${3-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func # Json func json_list_dns() { diff --git a/bin/v_list_dns_domains b/bin/v_list_dns_domains index 402539b3e..6bbdf68c9 100755 --- a/bin/v_list_dns_domains +++ b/bin/v_list_dns_domains @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_list_dns_template b/bin/v_list_dns_template index 96fc61cc1..5211073f7 100755 --- a/bin/v_list_dns_template +++ b/bin/v_list_dns_template @@ -11,8 +11,8 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_list_dns_templates b/bin/v_list_dns_templates index f865f8138..5fa73fee1 100755 --- a/bin/v_list_dns_templates +++ b/bin/v_list_dns_templates @@ -10,7 +10,7 @@ format=${1-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Json function json_list_dnstpl() { diff --git a/bin/v_list_ssl_certificates b/bin/v_list_ssl_certificates index 036ddac83..981ecca86 100755 --- a/bin/v_list_ssl_certificates +++ b/bin/v_list_ssl_certificates @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Json function json_list_cert() { diff --git a/bin/v_list_sys_cron b/bin/v_list_sys_cron index 5f34fa06b..ec687b74c 100755 --- a/bin/v_list_sys_cron +++ b/bin/v_list_sys_cron @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Json function json_list_cron() { diff --git a/bin/v_list_sys_interfaces b/bin/v_list_sys_interfaces index 7e9f559f7..79f1418b7 100755 --- a/bin/v_list_sys_interfaces +++ b/bin/v_list_sys_interfaces @@ -10,7 +10,7 @@ format=${1-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Json function json_list_iface() { diff --git a/bin/v_list_sys_ip b/bin/v_list_sys_ip index 7ca45d5db..45c6d994b 100755 --- a/bin/v_list_sys_ip +++ b/bin/v_list_sys_ip @@ -12,8 +12,8 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/ip.func # Json function json_list_ip() { diff --git a/bin/v_list_sys_ips b/bin/v_list_sys_ips index a61b92dd7..8334ff460 100755 --- a/bin/v_list_sys_ips +++ b/bin/v_list_sys_ips @@ -10,7 +10,7 @@ format=${1-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Json function json_list_ips() { diff --git a/bin/v_list_sys_user b/bin/v_list_sys_user index 1220322b8..b2c9d55f2 100755 --- a/bin/v_list_sys_user +++ b/bin/v_list_sys_user @@ -12,7 +12,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Json function json_list_user() { diff --git a/bin/v_list_sys_user_ips b/bin/v_list_sys_user_ips index 3c080d58f..1e1ccf235 100755 --- a/bin/v_list_sys_user_ips +++ b/bin/v_list_sys_user_ips @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Json function json_list_user_ips() { diff --git a/bin/v_list_sys_user_ns b/bin/v_list_sys_user_ns index 3caf67f79..b1fcda008 100755 --- a/bin/v_list_sys_user_ns +++ b/bin/v_list_sys_user_ns @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Json function json_list_ns() { diff --git a/bin/v_list_sys_user_packages b/bin/v_list_sys_user_packages index 2245f406d..325bf2c8c 100755 --- a/bin/v_list_sys_user_packages +++ b/bin/v_list_sys_user_packages @@ -10,7 +10,7 @@ format=${1-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Json function json_list_pkgs() { diff --git a/bin/v_list_sys_users b/bin/v_list_sys_users index 139a08a50..1b347371c 100755 --- a/bin/v_list_sys_users +++ b/bin/v_list_sys_users @@ -10,7 +10,7 @@ format=${1-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Json function json_list_users() { diff --git a/bin/v_list_web_domain b/bin/v_list_web_domain index d95f59f4d..5463975a1 100755 --- a/bin/v_list_web_domain +++ b/bin/v_list_web_domain @@ -12,8 +12,8 @@ format=${3-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func # Json function json_list_domain() { diff --git a/bin/v_list_web_domains b/bin/v_list_web_domains index 7eef94b91..59ea10401 100755 --- a/bin/v_list_web_domains +++ b/bin/v_list_web_domains @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_alias b/bin/v_list_web_domains_alias index 554fdd0b6..94457ec07 100755 --- a/bin/v_list_web_domains_alias +++ b/bin/v_list_web_domains_alias @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_elog b/bin/v_list_web_domains_elog index f511c6927..222007e47 100755 --- a/bin/v_list_web_domains_elog +++ b/bin/v_list_web_domains_elog @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_nginx b/bin/v_list_web_domains_nginx index eaf21132b..974564c1c 100755 --- a/bin/v_list_web_domains_nginx +++ b/bin/v_list_web_domains_nginx @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_ssl b/bin/v_list_web_domains_ssl index 6b9a4d92e..2af32b71a 100755 --- a/bin/v_list_web_domains_ssl +++ b/bin/v_list_web_domains_ssl @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_stats b/bin/v_list_web_domains_stats index 1bbd33234..5ee96f328 100755 --- a/bin/v_list_web_domains_stats +++ b/bin/v_list_web_domains_stats @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_list_web_templates b/bin/v_list_web_templates index 992567229..35344a476 100755 --- a/bin/v_list_web_templates +++ b/bin/v_list_web_templates @@ -11,7 +11,7 @@ format=${2-shell} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_rebuild_dns_domains b/bin/v_rebuild_dns_domains index ba4065785..4c00b574e 100755 --- a/bin/v_rebuild_dns_domains +++ b/bin/v_rebuild_dns_domains @@ -10,9 +10,9 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func +source $V_FUNC/ip.func #----------------------------------------------------------# diff --git a/bin/v_rebuild_sys_cron b/bin/v_rebuild_sys_cron index c81fb36b3..7a5d5a56b 100755 --- a/bin/v_rebuild_sys_cron +++ b/bin/v_rebuild_sys_cron @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cron_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cron.func #----------------------------------------------------------# diff --git a/bin/v_rebuild_web_domains b/bin/v_rebuild_web_domains index ee07cb849..8d5ce9e08 100755 --- a/bin/v_rebuild_web_domains +++ b/bin/v_rebuild_web_domains @@ -10,9 +10,9 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh -source $V_FUNC/ip_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func +source $V_FUNC/ip.func url=${2-$V_SUSPEND_URL} diff --git a/func/restart_cron b/bin/v_restart_cron similarity index 100% rename from func/restart_cron rename to bin/v_restart_cron diff --git a/func/restart_dns b/bin/v_restart_dns similarity index 57% rename from func/restart_dns rename to bin/v_restart_dns index 2833e5579..8e3738d08 100755 --- a/func/restart_dns +++ b/bin/v_restart_dns @@ -3,20 +3,20 @@ # dns system restart # Importing variables +source /etc/profile.d/vesta.sh +source $VESTA/conf/vesta.conf source $VESTA/conf/vars.conf bind() { - /etc/init.d/named 'reload' >/dev/null 2>&1 + /etc/init.d/named reload >/dev/null 2>&1 if [ $? -ne 0 ]; then #$V_FUNC/report_issue 'sys' 'cron' echo "$E_RESTART_FAILED $V_EVENT" fi } -# Parsing config / or just source config -dns_system=$(grep 'DNS_SYSTEM=' $V_CONF/vesta.conf | cut -f 2 -d \' ) -if [ "$dns_system" = 'bind' ]; then +if [ "$DNS_SYSTEM" = 'bind' ]; then bind fi diff --git a/func/restart_web b/bin/v_restart_web similarity index 100% rename from func/restart_web rename to bin/v_restart_web diff --git a/bin/v_suspend_db_base b/bin/v_suspend_db_base index c6964930a..6ec3f6fe4 100755 --- a/bin/v_suspend_db_base +++ b/bin/v_suspend_db_base @@ -11,8 +11,8 @@ database=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_suspend_db_bases b/bin/v_suspend_db_bases index db3ed3d5d..438e70470 100755 --- a/bin/v_suspend_db_bases +++ b/bin/v_suspend_db_bases @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_suspend_dns_domain b/bin/v_suspend_dns_domain index 460ce07e9..2d54b5416 100755 --- a/bin/v_suspend_dns_domain +++ b/bin/v_suspend_dns_domain @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_suspend_dns_domains b/bin/v_suspend_dns_domains index 44cbc84bc..6bbf192fc 100755 --- a/bin/v_suspend_dns_domains +++ b/bin/v_suspend_dns_domains @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_suspend_sys_cron_job b/bin/v_suspend_sys_cron_job index 153cc2da8..6ba7d627c 100755 --- a/bin/v_suspend_sys_cron_job +++ b/bin/v_suspend_sys_cron_job @@ -11,8 +11,8 @@ job=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cron_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cron.func #----------------------------------------------------------# diff --git a/bin/v_suspend_sys_cron_jobs b/bin/v_suspend_sys_cron_jobs index 9af942993..3d7240f52 100755 --- a/bin/v_suspend_sys_cron_jobs +++ b/bin/v_suspend_sys_cron_jobs @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cron_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cron.func #----------------------------------------------------------# diff --git a/bin/v_suspend_web_domain b/bin/v_suspend_web_domain index 836d2a2be..4ab997d9a 100755 --- a/bin/v_suspend_web_domain +++ b/bin/v_suspend_web_domain @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func # Defining url url="${3-$V_SUSPEND_URL}" diff --git a/bin/v_suspend_web_domains b/bin/v_suspend_web_domains index d5a2a20d2..2fb34e93a 100755 --- a/bin/v_suspend_web_domains +++ b/bin/v_suspend_web_domains @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func # Defining url url="${2-$V_SUSPEND_URL}" diff --git a/bin/v_unsuspend_db_base b/bin/v_unsuspend_db_base index 5c88677a1..0f39ac8d7 100755 --- a/bin/v_unsuspend_db_base +++ b/bin/v_unsuspend_db_base @@ -11,8 +11,8 @@ database=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_unsuspend_db_bases b/bin/v_unsuspend_db_bases index 85487e8bf..88c4a0844 100755 --- a/bin/v_unsuspend_db_bases +++ b/bin/v_unsuspend_db_bases @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_unsuspend_dns_domain b/bin/v_unsuspend_dns_domain index 664793894..fc695bc8a 100755 --- a/bin/v_unsuspend_dns_domain +++ b/bin/v_unsuspend_dns_domain @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_unsuspend_dns_domains b/bin/v_unsuspend_dns_domains index 373bd3f16..e35f0fa8e 100755 --- a/bin/v_unsuspend_dns_domains +++ b/bin/v_unsuspend_dns_domains @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_unsuspend_sys_cron_job b/bin/v_unsuspend_sys_cron_job index c110af1b5..739f65229 100755 --- a/bin/v_unsuspend_sys_cron_job +++ b/bin/v_unsuspend_sys_cron_job @@ -11,8 +11,8 @@ job=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cron_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cron.func #----------------------------------------------------------# diff --git a/bin/v_unsuspend_sys_cron_jobs b/bin/v_unsuspend_sys_cron_jobs index 09c2657cc..8cd9698bf 100755 --- a/bin/v_unsuspend_sys_cron_jobs +++ b/bin/v_unsuspend_sys_cron_jobs @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/cron_func.sh +source $V_FUNC/shared.func +source $V_FUNC/cron.func #----------------------------------------------------------# diff --git a/bin/v_unsuspend_web_domain b/bin/v_unsuspend_web_domain index f997eacc2..769f96eee 100755 --- a/bin/v_unsuspend_web_domain +++ b/bin/v_unsuspend_web_domain @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_unsuspend_web_domains b/bin/v_unsuspend_web_domains index 83a772890..8ff75d742 100755 --- a/bin/v_unsuspend_web_domains +++ b/bin/v_unsuspend_web_domains @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_upd_db_base_disk b/bin/v_upd_db_base_disk index ee5244581..e4eda0f85 100755 --- a/bin/v_upd_db_base_disk +++ b/bin/v_upd_db_base_disk @@ -11,8 +11,8 @@ database=$2 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_upd_db_bases_disk b/bin/v_upd_db_bases_disk index 587c4a8c9..9d4116429 100755 --- a/bin/v_upd_db_bases_disk +++ b/bin/v_upd_db_bases_disk @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_upd_sys_ip b/bin/v_upd_sys_ip index a67b3e7b1..00cd1f6a7 100755 --- a/bin/v_upd_sys_ip +++ b/bin/v_upd_sys_ip @@ -13,9 +13,9 @@ ip_status=${4-shared} # Importing variables source $VESTA/conf/vars.conf # include for internal func -source $V_FUNC/shared_func.sh -source $V_FUNC/ip_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/ip.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_upd_sys_queue b/bin/v_upd_sys_queue index 2f0d861a2..139842399 100755 --- a/bin/v_upd_sys_queue +++ b/bin/v_upd_sys_queue @@ -11,14 +11,31 @@ pipe=$1 # mostly by cron wich not read it by itself source /etc/profile.d/vesta.sh - # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func + +# Defining pipe functions +restart_pipe() { + for service in $(cat $V_QUEUE/restart.pipe |sort |uniq); do + $V_BIN/v_restart_$service + done + echo > $V_QUEUE/restart.pipe +} + +stats_pipe() { + bash $V_QUEUE/stats.pipe +} + +disk_pipe() { + bash $V_QUEUE/disk.pipe +} + +traff_pipe() { + bash $V_QUEUE/traffic.pipe +} + -# Another workaround for cron enviroment -PATH="$PATH:$V_BIN" -export PATH #----------------------------------------------------------# # Verifications # @@ -35,33 +52,13 @@ format_validation 'pipe' # Action # #----------------------------------------------------------# -# Defining pipe functions -restart_pipe() { - for service in $(cat $V_QUEUE/restart.pipe |sort |uniq); do - $V_FUNC/restart_$service - done - echo >$V_QUEUE/restart.pipe -} - -stats_pipe() { - bash $V_QUEUE/stats.pipe -} - -disk_pipe() { - bash $V_QUEUE/disk.pipe -} - -traff_pipe() { - bash $V_QUEUE/traffic.pipe -} - case $pipe in - restart) restart_pipe ;; - stats) stats_pipe ;; - backup) backup_pipe ;; - disk) disk_pipe ;; - traffic) traff_pipe ;; - *) check_args '1' '0' 'pipe' + restart) restart_pipe ;; + stats) stats_pipe ;; + backup) backup_pipe ;; + disk) disk_pipe ;; + traffic) traff_pipe ;; + *) check_args '1' '0' 'pipe' esac diff --git a/bin/v_upd_sys_rrd b/bin/v_upd_sys_rrd index 693388366..fd9d45886 100755 --- a/bin/v_upd_sys_rrd +++ b/bin/v_upd_sys_rrd @@ -13,7 +13,7 @@ source /etc/profile.d/vesta.sh # Importing variables source $VESTA/conf/vars.conf source $V_CONF/vesta.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func # Another workaround for cron enviroment PATH="$PATH:$V_BIN" diff --git a/bin/v_upd_sys_rrd_httpd b/bin/v_upd_sys_rrd_httpd index 7429d4115..a8a5714e3 100755 --- a/bin/v_upd_sys_rrd_httpd +++ b/bin/v_upd_sys_rrd_httpd @@ -13,8 +13,8 @@ rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M} # Importing variables source $VESTA/conf/vars.conf source $V_CONF/vesta.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_upd_sys_rrd_mysql b/bin/v_upd_sys_rrd_mysql index 98e3ea26a..f8c16ab81 100755 --- a/bin/v_upd_sys_rrd_mysql +++ b/bin/v_upd_sys_rrd_mysql @@ -12,8 +12,8 @@ rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_upd_sys_rrd_pgsql b/bin/v_upd_sys_rrd_pgsql index 7fb5ce2a0..ff9bc0dd9 100755 --- a/bin/v_upd_sys_rrd_pgsql +++ b/bin/v_upd_sys_rrd_pgsql @@ -12,8 +12,8 @@ rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M} # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/db_func.sh +source $V_FUNC/shared.func +source $V_FUNC/db.func #----------------------------------------------------------# diff --git a/bin/v_upd_sys_user_bill b/bin/v_upd_sys_user_bill index a0d34c9aa..13d6a6691 100755 --- a/bin/v_upd_sys_user_bill +++ b/bin/v_upd_sys_user_bill @@ -14,8 +14,8 @@ source /etc/profile.d/vesta.sh # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_upd_sys_user_disk b/bin/v_upd_sys_user_disk index 53ec7f8aa..ec16c4f5b 100755 --- a/bin/v_upd_sys_user_disk +++ b/bin/v_upd_sys_user_disk @@ -10,7 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_upd_sys_vesta b/bin/v_upd_sys_vesta index d6ea3e300..51af603ce 100755 --- a/bin/v_upd_sys_vesta +++ b/bin/v_upd_sys_vesta @@ -17,7 +17,7 @@ source /etc/profile.d/vesta.sh # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh +source $V_FUNC/shared.func source $V_CONF/vesta.conf diff --git a/bin/v_upd_web_domain_disk b/bin/v_upd_web_domain_disk index d69c15893..9de9b649a 100755 --- a/bin/v_upd_web_domain_disk +++ b/bin/v_upd_web_domain_disk @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_upd_web_domain_stat b/bin/v_upd_web_domain_stat index 9016b4b52..974778fde 100755 --- a/bin/v_upd_web_domain_stat +++ b/bin/v_upd_web_domain_stat @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_upd_web_domain_traff b/bin/v_upd_web_domain_traff index 25c90867a..82523d80a 100755 --- a/bin/v_upd_web_domain_traff +++ b/bin/v_upd_web_domain_traff @@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_upd_web_domains_disk b/bin/v_upd_web_domains_disk index a05542bd6..79ba50336 100755 --- a/bin/v_upd_web_domains_disk +++ b/bin/v_upd_web_domains_disk @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_upd_web_domains_stat b/bin/v_upd_web_domains_stat index 022b14a98..a27a95dd6 100755 --- a/bin/v_upd_web_domains_stat +++ b/bin/v_upd_web_domains_stat @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/bin/v_upd_web_domains_traff b/bin/v_upd_web_domains_traff index 68df310d4..a49b39a38 100755 --- a/bin/v_upd_web_domains_traff +++ b/bin/v_upd_web_domains_traff @@ -10,8 +10,8 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf -source $V_FUNC/shared_func.sh -source $V_FUNC/domain_func.sh +source $V_FUNC/shared.func +source $V_FUNC/domain.func #----------------------------------------------------------# diff --git a/func/cert_func.sh b/func/cert.func similarity index 100% rename from func/cert_func.sh rename to func/cert.func diff --git a/func/cron_func.sh b/func/cron.func similarity index 100% rename from func/cron_func.sh rename to func/cron.func diff --git a/func/db_func.sh b/func/db.func similarity index 100% rename from func/db_func.sh rename to func/db.func diff --git a/func/domain_func.sh b/func/domain.func similarity index 100% rename from func/domain_func.sh rename to func/domain.func diff --git a/func/ip_func.sh b/func/ip.func similarity index 100% rename from func/ip_func.sh rename to func/ip.func diff --git a/func/shared_func.sh b/func/shared.func similarity index 100% rename from func/shared_func.sh rename to func/shared.func