From 3a268ebe642776caeca8a458e2e301ad18144680 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 21 Nov 2011 15:46:02 +0200 Subject: [PATCH] added main include --- bin/v_add_db_base | 1 + bin/v_add_db_host | 1 + bin/v_add_dns_domain | 1 + bin/v_add_dns_domain_record | 1 + bin/v_add_ssl_certificate | 1 + bin/v_add_sys_cron | 1 + bin/v_add_sys_ip | 1 + bin/v_add_sys_user | 1 + bin/v_add_sys_user_reports | 1 + bin/v_backup_sys_user | 1 + bin/v_backup_sys_users | 1 + bin/v_change_db_password | 1 + bin/v_change_dns_domain_exp | 1 + bin/v_change_dns_domain_ip | 1 + bin/v_change_dns_domain_record | 1 + bin/v_change_dns_domain_soa | 1 + bin/v_change_dns_domain_tpl | 1 + bin/v_change_dns_domain_ttl | 1 + bin/v_change_sys_config_value | 1 + bin/v_change_sys_cron_job | 1 + bin/v_change_sys_ip_name | 1 + bin/v_change_sys_ip_owner | 1 + bin/v_change_sys_ip_status | 1 + bin/v_change_sys_user_contact | 1 + bin/v_change_sys_user_name | 1 + bin/v_change_sys_user_ns | 1 + bin/v_change_sys_user_package | 1 + bin/v_change_sys_user_password | 1 + bin/v_change_sys_user_shell | 1 + bin/v_del_db_base | 1 + bin/v_del_db_dbases | 1 + bin/v_del_db_host | 1 + bin/v_del_dns_domain | 1 + bin/v_del_dns_domain_record | 1 + bin/v_del_dns_domains | 1 + bin/v_del_ssl_certificate | 1 + bin/v_del_sys_cron | 1 + bin/v_del_sys_ip | 1 + bin/v_del_sys_user | 1 + bin/v_del_sys_user_reports | 1 + bin/v_get_dns_domain_value | 1 + bin/v_get_sys_user_value | 1 + bin/v_rebuild_dns_domains | 1 + bin/v_rebuild_sys_cron | 1 + bin/v_restart_cron | 1 + bin/v_restart_dns | 1 + bin/v_suspend_db_base | 1 + bin/v_suspend_db_bases | 1 + bin/v_suspend_dns_domain | 1 + bin/v_suspend_dns_domains | 1 + bin/v_suspend_sys_cron_job | 1 + bin/v_suspend_sys_cron_jobs | 1 + bin/v_unsuspend_db_base | 1 + bin/v_unsuspend_db_bases | 1 + bin/v_unsuspend_dns_domain | 1 + bin/v_unsuspend_dns_domains | 1 + bin/v_unsuspend_sys_cron_job | 1 + bin/v_unsuspend_sys_cron_jobs | 1 + bin/v_upd_db_base_disk | 1 + bin/v_upd_db_bases_disk | 1 + bin/v_upd_sys_ip | 3 ++- bin/v_upd_sys_queue | 1 + bin/v_upd_sys_rrd | 1 + bin/v_upd_sys_rrd_ftp | 1 + bin/v_upd_sys_rrd_httpd | 1 + bin/v_upd_sys_rrd_la | 1 + bin/v_upd_sys_rrd_mem | 1 + bin/v_upd_sys_rrd_mysql | 1 + bin/v_upd_sys_rrd_net | 1 + bin/v_upd_sys_rrd_nginx | 1 + bin/v_upd_sys_rrd_pgsql | 1 + bin/v_upd_sys_rrd_ssh | 1 + bin/v_upd_sys_user_bill | 1 + bin/v_upd_sys_user_disk | 1 + bin/v_upd_sys_vesta | 1 + 75 files changed, 76 insertions(+), 1 deletion(-) diff --git a/bin/v_add_db_base b/bin/v_add_db_base index 9bb055b2..c8cadf56 100755 --- a/bin/v_add_db_base +++ b/bin/v_add_db_base @@ -16,6 +16,7 @@ encoding=${7-UTF8} # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 d2993c87..968737ae 100755 --- a/bin/v_add_db_host +++ b/bin/v_add_db_host @@ -18,6 +18,7 @@ template=${8-template1} # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 28fb4da1..33e7df2d 100755 --- a/bin/v_add_dns_domain +++ b/bin/v_add_dns_domain @@ -18,6 +18,7 @@ ttl=${7-14400} # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 df9b644b..77f8aef8 100755 --- a/bin/v_add_dns_domain_record +++ b/bin/v_add_dns_domain_record @@ -16,6 +16,7 @@ id=$6 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 8387c36b..62c7ee3a 100755 --- a/bin/v_add_ssl_certificate +++ b/bin/v_add_ssl_certificate @@ -11,6 +11,7 @@ ssl=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/cert.func diff --git a/bin/v_add_sys_cron b/bin/v_add_sys_cron index 37a19d3c..5a9352ce 100755 --- a/bin/v_add_sys_cron +++ b/bin/v_add_sys_cron @@ -17,6 +17,7 @@ job=$8 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 3c46a3f0..0e1d1d62 100755 --- a/bin/v_add_sys_ip +++ b/bin/v_add_sys_ip @@ -15,6 +15,7 @@ ip_name=$6 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/ip.func source $V_FUNC/domain.func # for namehosting diff --git a/bin/v_add_sys_user b/bin/v_add_sys_user index ee4f16fc..3f8f6674 100755 --- a/bin/v_add_sys_user +++ b/bin/v_add_sys_user @@ -15,6 +15,7 @@ lname=$6 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func diff --git a/bin/v_add_sys_user_reports b/bin/v_add_sys_user_reports index a6babc40..0d4f25e9 100755 --- a/bin/v_add_sys_user_reports +++ b/bin/v_add_sys_user_reports @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/cron.func diff --git a/bin/v_backup_sys_user b/bin/v_backup_sys_user index 8efb6dd8..835c9c64 100755 --- a/bin/v_backup_sys_user +++ b/bin/v_backup_sys_user @@ -11,6 +11,7 @@ output=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/domain.func source $V_FUNC/db.func diff --git a/bin/v_backup_sys_users b/bin/v_backup_sys_users index 877b0044..ea0b2b48 100755 --- a/bin/v_backup_sys_users +++ b/bin/v_backup_sys_users @@ -12,6 +12,7 @@ source /etc/profile.d/vesta.sh # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func diff --git a/bin/v_change_db_password b/bin/v_change_db_password index bb67fca7..9e7dabda 100755 --- a/bin/v_change_db_password +++ b/bin/v_change_db_password @@ -12,6 +12,7 @@ db_password=$3 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 48cd5093..80015204 100755 --- a/bin/v_change_dns_domain_exp +++ b/bin/v_change_dns_domain_exp @@ -13,6 +13,7 @@ exp=$3 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 201b4e5a..b7e0aaa5 100755 --- a/bin/v_change_dns_domain_ip +++ b/bin/v_change_dns_domain_ip @@ -13,6 +13,7 @@ ip=$3 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/domain.func diff --git a/bin/v_change_dns_domain_record b/bin/v_change_dns_domain_record index f91f2430..65a42183 100755 --- a/bin/v_change_dns_domain_record +++ b/bin/v_change_dns_domain_record @@ -16,6 +16,7 @@ value=$(idn -t --quiet -u "$6" ) # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 03fc313e..4d7f7e94 100755 --- a/bin/v_change_dns_domain_soa +++ b/bin/v_change_dns_domain_soa @@ -13,6 +13,7 @@ soa=$3 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/domain.func diff --git a/bin/v_change_dns_domain_tpl b/bin/v_change_dns_domain_tpl index 7ffc5ab1..3deef700 100755 --- a/bin/v_change_dns_domain_tpl +++ b/bin/v_change_dns_domain_tpl @@ -13,6 +13,7 @@ template=$3 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 08adb288..6725d06b 100755 --- a/bin/v_change_dns_domain_ttl +++ b/bin/v_change_dns_domain_ttl @@ -13,6 +13,7 @@ ttl=$3 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/domain.func diff --git a/bin/v_change_sys_config_value b/bin/v_change_sys_config_value index 30667873..b04770ed 100755 --- a/bin/v_change_sys_config_value +++ b/bin/v_change_sys_config_value @@ -11,6 +11,7 @@ value=${2// /%spc%} # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func diff --git a/bin/v_change_sys_cron_job b/bin/v_change_sys_cron_job index 41ac3a52..f56c0d68 100755 --- a/bin/v_change_sys_cron_job +++ b/bin/v_change_sys_cron_job @@ -17,6 +17,7 @@ command=$8 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 4694ddee..d2f07b01 100755 --- a/bin/v_change_sys_ip_name +++ b/bin/v_change_sys_ip_name @@ -11,6 +11,7 @@ ip_name=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 003611d7..4ab3b37d 100755 --- a/bin/v_change_sys_ip_owner +++ b/bin/v_change_sys_ip_owner @@ -11,6 +11,7 @@ ip=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 b6947fbb..220768a8 100755 --- a/bin/v_change_sys_ip_status +++ b/bin/v_change_sys_ip_status @@ -11,6 +11,7 @@ ip_status=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 d12e1366..185434b0 100755 --- a/bin/v_change_sys_user_contact +++ b/bin/v_change_sys_user_contact @@ -11,6 +11,7 @@ email=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func #----------------------------------------------------------# diff --git a/bin/v_change_sys_user_name b/bin/v_change_sys_user_name index 9a51fad7..86653f03 100755 --- a/bin/v_change_sys_user_name +++ b/bin/v_change_sys_user_name @@ -12,6 +12,7 @@ lname=$3 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func diff --git a/bin/v_change_sys_user_ns b/bin/v_change_sys_user_ns index ccffbc74..198a35eb 100755 --- a/bin/v_change_sys_user_ns +++ b/bin/v_change_sys_user_ns @@ -18,6 +18,7 @@ ns8=$9 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func diff --git a/bin/v_change_sys_user_package b/bin/v_change_sys_user_package index 06d26f5f..79b53816 100755 --- a/bin/v_change_sys_user_package +++ b/bin/v_change_sys_user_package @@ -11,6 +11,7 @@ package=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func diff --git a/bin/v_change_sys_user_password b/bin/v_change_sys_user_password index 0ef71b1c..a0fde1d5 100755 --- a/bin/v_change_sys_user_password +++ b/bin/v_change_sys_user_password @@ -11,6 +11,7 @@ password=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func diff --git a/bin/v_change_sys_user_shell b/bin/v_change_sys_user_shell index f7687355..187d97db 100755 --- a/bin/v_change_sys_user_shell +++ b/bin/v_change_sys_user_shell @@ -11,6 +11,7 @@ shell=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func diff --git a/bin/v_del_db_base b/bin/v_del_db_base index 2608ba10..f15a6fc5 100755 --- a/bin/v_del_db_base +++ b/bin/v_del_db_base @@ -11,6 +11,7 @@ database=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 52ae6209..6b9974d8 100755 --- a/bin/v_del_db_dbases +++ b/bin/v_del_db_dbases @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 33c1a760..7f232b43 100755 --- a/bin/v_del_db_host +++ b/bin/v_del_db_host @@ -11,6 +11,7 @@ host=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 baedc278..fb854053 100755 --- a/bin/v_del_dns_domain +++ b/bin/v_del_dns_domain @@ -12,6 +12,7 @@ named_conf=/etc/named.conf # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 92726cbe..835e32ca 100755 --- a/bin/v_del_dns_domain_record +++ b/bin/v_del_dns_domain_record @@ -13,6 +13,7 @@ id=$3 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 4d79b1f5..edfe19af 100755 --- a/bin/v_del_dns_domains +++ b/bin/v_del_dns_domains @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 e0c7a57b..1c20bc4c 100755 --- a/bin/v_del_ssl_certificate +++ b/bin/v_del_ssl_certificate @@ -11,6 +11,7 @@ ssl=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 9e9a1ba5..b74f365a 100755 --- a/bin/v_del_sys_cron +++ b/bin/v_del_sys_cron @@ -11,6 +11,7 @@ job=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 7d221f41..856b953a 100755 --- a/bin/v_del_sys_ip +++ b/bin/v_del_sys_ip @@ -10,6 +10,7 @@ ip=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 18195d14..8ed3b294 100755 --- a/bin/v_del_sys_user +++ b/bin/v_del_sys_user @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/domain.func source $V_FUNC/db.func diff --git a/bin/v_del_sys_user_reports b/bin/v_del_sys_user_reports index b04b6cd0..01bbf395 100755 --- a/bin/v_del_sys_user_reports +++ b/bin/v_del_sys_user_reports @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/cron.func diff --git a/bin/v_get_dns_domain_value b/bin/v_get_dns_domain_value index 06316eb7..43ab2095 100755 --- a/bin/v_get_dns_domain_value +++ b/bin/v_get_dns_domain_value @@ -13,6 +13,7 @@ key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 3e5a255b..5b5062a8 100755 --- a/bin/v_get_sys_user_value +++ b/bin/v_get_sys_user_value @@ -11,6 +11,7 @@ key=$(echo "$2"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func diff --git a/bin/v_rebuild_dns_domains b/bin/v_rebuild_dns_domains index 4c00b574..e207259b 100755 --- a/bin/v_rebuild_dns_domains +++ b/bin/v_rebuild_dns_domains @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 7a5d5a56..c375e245 100755 --- a/bin/v_rebuild_sys_cron +++ b/bin/v_rebuild_sys_cron @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/cron.func diff --git a/bin/v_restart_cron b/bin/v_restart_cron index f9c7a51b..cd998041 100755 --- a/bin/v_restart_cron +++ b/bin/v_restart_cron @@ -4,6 +4,7 @@ # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf crond() { /etc/init.d/crond 'reload' >/dev/null 2>&1 diff --git a/bin/v_restart_dns b/bin/v_restart_dns index 8e3738d0..ca04685b 100755 --- a/bin/v_restart_dns +++ b/bin/v_restart_dns @@ -6,6 +6,7 @@ source /etc/profile.d/vesta.sh source $VESTA/conf/vesta.conf source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf bind() { /etc/init.d/named reload >/dev/null 2>&1 diff --git a/bin/v_suspend_db_base b/bin/v_suspend_db_base index 6ec3f6fe..61379a07 100755 --- a/bin/v_suspend_db_base +++ b/bin/v_suspend_db_base @@ -11,6 +11,7 @@ database=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 438e7047..75f21257 100755 --- a/bin/v_suspend_db_bases +++ b/bin/v_suspend_db_bases @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 2d54b541..0a8d4003 100755 --- a/bin/v_suspend_dns_domain +++ b/bin/v_suspend_dns_domain @@ -12,6 +12,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 6bbf192f..2ad6f05c 100755 --- a/bin/v_suspend_dns_domains +++ b/bin/v_suspend_dns_domains @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 6ba7d627..05caede8 100755 --- a/bin/v_suspend_sys_cron_job +++ b/bin/v_suspend_sys_cron_job @@ -11,6 +11,7 @@ job=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 3d7240f5..294c80e3 100755 --- a/bin/v_suspend_sys_cron_jobs +++ b/bin/v_suspend_sys_cron_jobs @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/cron.func diff --git a/bin/v_unsuspend_db_base b/bin/v_unsuspend_db_base index 0f39ac8d..303b8820 100755 --- a/bin/v_unsuspend_db_base +++ b/bin/v_unsuspend_db_base @@ -11,6 +11,7 @@ database=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 88c4a084..d21b2e92 100755 --- a/bin/v_unsuspend_db_bases +++ b/bin/v_unsuspend_db_bases @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 fc695bc8..351e6ed4 100755 --- a/bin/v_unsuspend_dns_domain +++ b/bin/v_unsuspend_dns_domain @@ -12,6 +12,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 e35f0fa8..f862d978 100755 --- a/bin/v_unsuspend_dns_domains +++ b/bin/v_unsuspend_dns_domains @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 739f6522..bee60fd5 100755 --- a/bin/v_unsuspend_sys_cron_job +++ b/bin/v_unsuspend_sys_cron_job @@ -11,6 +11,7 @@ job=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 8cd9698b..170e4e28 100755 --- a/bin/v_unsuspend_sys_cron_jobs +++ b/bin/v_unsuspend_sys_cron_jobs @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/cron.func diff --git a/bin/v_upd_db_base_disk b/bin/v_upd_db_base_disk index e4eda0f8..a8f88a0f 100755 --- a/bin/v_upd_db_base_disk +++ b/bin/v_upd_db_base_disk @@ -11,6 +11,7 @@ database=$2 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 9d411642..214ddcc9 100755 --- a/bin/v_upd_db_bases_disk +++ b/bin/v_upd_db_bases_disk @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 00cd1f6a..7aab79ea 100755 --- a/bin/v_upd_sys_ip +++ b/bin/v_upd_sys_ip @@ -12,7 +12,8 @@ owner=${3-vesta} ip_status=${4-shared} # Importing variables -source $VESTA/conf/vars.conf # include for internal func +source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf # include for internal func 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 13984239..1573a323 100755 --- a/bin/v_upd_sys_queue +++ b/bin/v_upd_sys_queue @@ -13,6 +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 # Defining pipe functions diff --git a/bin/v_upd_sys_rrd b/bin/v_upd_sys_rrd index fd9d4588..7de8f8f6 100755 --- a/bin/v_upd_sys_rrd +++ b/bin/v_upd_sys_rrd @@ -13,6 +13,7 @@ source /etc/profile.d/vesta.sh # Importing variables source $VESTA/conf/vars.conf source $V_CONF/vesta.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func # Another workaround for cron enviroment diff --git a/bin/v_upd_sys_rrd_ftp b/bin/v_upd_sys_rrd_ftp index d6873ca9..7a603329 100755 --- a/bin/v_upd_sys_rrd_ftp +++ b/bin/v_upd_sys_rrd_ftp @@ -13,6 +13,7 @@ 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_CONF/vesta.conf #----------------------------------------------------------# diff --git a/bin/v_upd_sys_rrd_httpd b/bin/v_upd_sys_rrd_httpd index a8a5714e..2d41e11f 100755 --- a/bin/v_upd_sys_rrd_httpd +++ b/bin/v_upd_sys_rrd_httpd @@ -13,6 +13,7 @@ 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_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/domain.func diff --git a/bin/v_upd_sys_rrd_la b/bin/v_upd_sys_rrd_la index 0afd1e5f..be19ddd2 100755 --- a/bin/v_upd_sys_rrd_la +++ b/bin/v_upd_sys_rrd_la @@ -12,6 +12,7 @@ rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M} # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf #----------------------------------------------------------# diff --git a/bin/v_upd_sys_rrd_mem b/bin/v_upd_sys_rrd_mem index 6d39ee88..12356b91 100755 --- a/bin/v_upd_sys_rrd_mem +++ b/bin/v_upd_sys_rrd_mem @@ -12,6 +12,7 @@ rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M} # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf #----------------------------------------------------------# diff --git a/bin/v_upd_sys_rrd_mysql b/bin/v_upd_sys_rrd_mysql index f8c16ab8..14441078 100755 --- a/bin/v_upd_sys_rrd_mysql +++ b/bin/v_upd_sys_rrd_mysql @@ -12,6 +12,7 @@ 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 source $V_FUNC/db.func diff --git a/bin/v_upd_sys_rrd_net b/bin/v_upd_sys_rrd_net index 8f33a3c3..7ca46a30 100755 --- a/bin/v_upd_sys_rrd_net +++ b/bin/v_upd_sys_rrd_net @@ -12,6 +12,7 @@ rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M} # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf #----------------------------------------------------------# diff --git a/bin/v_upd_sys_rrd_nginx b/bin/v_upd_sys_rrd_nginx index 36ee5876..1833a5e0 100755 --- a/bin/v_upd_sys_rrd_nginx +++ b/bin/v_upd_sys_rrd_nginx @@ -12,6 +12,7 @@ rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M} # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf #----------------------------------------------------------# diff --git a/bin/v_upd_sys_rrd_pgsql b/bin/v_upd_sys_rrd_pgsql index ff9bc0dd..abab6e37 100755 --- a/bin/v_upd_sys_rrd_pgsql +++ b/bin/v_upd_sys_rrd_pgsql @@ -12,6 +12,7 @@ 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 source $V_FUNC/db.func diff --git a/bin/v_upd_sys_rrd_ssh b/bin/v_upd_sys_rrd_ssh index 6c61ba94..eca98a16 100755 --- a/bin/v_upd_sys_rrd_ssh +++ b/bin/v_upd_sys_rrd_ssh @@ -13,6 +13,7 @@ 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_CONF/vesta.conf #----------------------------------------------------------# diff --git a/bin/v_upd_sys_user_bill b/bin/v_upd_sys_user_bill index 13d6a669..9c4d3f35 100755 --- a/bin/v_upd_sys_user_bill +++ b/bin/v_upd_sys_user_bill @@ -14,6 +14,7 @@ source /etc/profile.d/vesta.sh # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf 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 ec16c4f5..2c9c6458 100755 --- a/bin/v_upd_sys_user_disk +++ b/bin/v_upd_sys_user_disk @@ -10,6 +10,7 @@ user=$1 # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func diff --git a/bin/v_upd_sys_vesta b/bin/v_upd_sys_vesta index 51af603c..62ccb86d 100755 --- a/bin/v_upd_sys_vesta +++ b/bin/v_upd_sys_vesta @@ -17,6 +17,7 @@ source /etc/profile.d/vesta.sh # Importing variables source $VESTA/conf/vars.conf +source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_CONF/vesta.conf