added main include

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 
 

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
 

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

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
 
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 
 

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
 

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
 

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
 

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
 

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
 
 #----------------------------------------------------------#

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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

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
 

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
 

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
 
 

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

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
 

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

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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

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

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
 
 
 #----------------------------------------------------------#

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
 

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
 
 
 #----------------------------------------------------------#

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
 
 
 #----------------------------------------------------------#

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
 

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
 
 
 #----------------------------------------------------------#

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
 
 
 #----------------------------------------------------------#

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
 

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
 
 
 #----------------------------------------------------------#

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
 

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
 
 

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