added main include

serghey-rodin · serghey-rodin · commit 3a268ebe6427 · 2011-11-21T15:46:02.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/bin/v_suspend_sys_cron_jobs b/bin/v_suspend_sys_cron_jobs
diff --git a/bin/v_unsuspend_db_base b/bin/v_unsuspend_db_base
diff --git a/bin/v_unsuspend_db_bases b/bin/v_unsuspend_db_bases
diff --git a/bin/v_unsuspend_dns_domain b/bin/v_unsuspend_dns_domain
diff --git a/bin/v_unsuspend_dns_domains b/bin/v_unsuspend_dns_domains
diff --git a/bin/v_unsuspend_sys_cron_job b/bin/v_unsuspend_sys_cron_job
diff --git a/bin/v_unsuspend_sys_cron_jobs b/bin/v_unsuspend_sys_cron_jobs
diff --git a/bin/v_upd_db_base_disk b/bin/v_upd_db_base_disk
diff --git a/bin/v_upd_db_bases_disk b/bin/v_upd_db_bases_disk
diff --git a/bin/v_upd_sys_ip b/bin/v_upd_sys_ip
diff --git a/bin/v_upd_sys_queue b/bin/v_upd_sys_queue
diff --git a/bin/v_upd_sys_rrd b/bin/v_upd_sys_rrd
diff --git a/bin/v_upd_sys_rrd_ftp b/bin/v_upd_sys_rrd_ftp
diff --git a/bin/v_upd_sys_rrd_httpd b/bin/v_upd_sys_rrd_httpd
diff --git a/bin/v_upd_sys_rrd_la b/bin/v_upd_sys_rrd_la
diff --git a/bin/v_upd_sys_rrd_mem b/bin/v_upd_sys_rrd_mem
diff --git a/bin/v_upd_sys_rrd_mysql b/bin/v_upd_sys_rrd_mysql
diff --git a/bin/v_upd_sys_rrd_net b/bin/v_upd_sys_rrd_net
diff --git a/bin/v_upd_sys_rrd_nginx b/bin/v_upd_sys_rrd_nginx
diff --git a/bin/v_upd_sys_rrd_pgsql b/bin/v_upd_sys_rrd_pgsql
diff --git a/bin/v_upd_sys_rrd_ssh b/bin/v_upd_sys_rrd_ssh
diff --git a/bin/v_upd_sys_user_bill b/bin/v_upd_sys_user_bill
diff --git a/bin/v_upd_sys_user_disk b/bin/v_upd_sys_user_disk
diff --git a/bin/v_upd_sys_vesta b/bin/v_upd_sys_vesta
