from now vesta.conf can override any func variable

2025-08-14 02:28:05 -07:00 · 2013-10-09 00:50:08 +03:00 · 2013-10-09 00:50:08 +03:00 · ed54f83795
commit ed54f83795
parent 73be3c7543
200 changed files with 200 additions and 201 deletions
--- a/bin/v-add-backup-ftp-host
+++ b/bin/v-add-backup-ftp-host
@ -18,8 +18,8 @@ ftp_port=${5-21}
 A3='******'

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf

 # Defining ftp command function
 ftpc() {
--- a/bin/v-add-cron-job
+++ b/bin/v-add-cron-job
@ -22,8 +22,8 @@ job=$8
 restart=$9

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf

 # Assing new value
 A7="$command"
--- a/bin/v-add-cron-report
+++ b/bin/v-add-cron-report
@ -14,8 +14,8 @@
 user=$1

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-cron-restart-job
+++ b/bin/v-add-cron-restart-job
@ -10,8 +10,8 @@
 #----------------------------------------------------------#

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-database
+++ b/bin/v-add-database
@ -26,9 +26,9 @@ charset=${7-UTF8}
 charset=$(echo "$charset" |tr '[:lower:]' '[:upper:]')

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/db.sh
+source $VESTA/conf/vesta.conf

 # Hiding password
 A4='******'
--- a/bin/v-add-database-host
+++ b/bin/v-add-database-host
@ -23,9 +23,9 @@ charsets=${7-UTF8,LATIN1,WIN1250,WIN1251,WIN1252,WIN1256,WIN1258,KOI8}
 template=${8-template1}

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/db.sh
+source $VESTA/conf/vesta.conf

 # Hiding password
 A4='******'
--- a/bin/v-add-dns-domain
+++ b/bin/v-add-dns-domain
@ -27,9 +27,9 @@ ns4=$7
 restart=$8

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-dns-on-web-alias
+++ b/bin/v-add-dns-on-web-alias
@ -20,9 +20,9 @@ dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
 restart="$4"

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-dns-record
+++ b/bin/v-add-dns-record
@ -29,9 +29,9 @@ if [ -z "$priority" ]; then
 fi

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-domain
+++ b/bin/v-add-domain
@ -15,9 +15,9 @@ domain=$2
 ip=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-mail-account
+++ b/bin/v-add-mail-account
@ -19,9 +19,9 @@ password=$4
 quota=${5-0}

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf

 # Hiding password
 A4='******'
--- a/bin/v-add-mail-account-alias
+++ b/bin/v-add-mail-account-alias
@ -18,9 +18,9 @@ account=$3
 malias=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-mail-account-autoreply
+++ b/bin/v-add-mail-account-autoreply
@ -18,9 +18,9 @@ account=$3
 autoreply=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-mail-account-forward
+++ b/bin/v-add-mail-account-forward
@ -18,9 +18,9 @@ account=$3
 forward=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-mail-domain
+++ b/bin/v-add-mail-domain
@ -21,9 +21,9 @@ dkim=${5-yes}
 dkim_size=${6-512}

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-mail-domain-antispam
+++ b/bin/v-add-mail-domain-antispam
@ -16,9 +16,9 @@ domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
 domain_idn=$(idn -t --quiet -a "$domain")

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-mail-domain-antivirus
+++ b/bin/v-add-mail-domain-antivirus
@ -16,9 +16,9 @@ domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
 domain_idn=$(idn -t --quiet -a "$domain")

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-mail-domain-catchall
+++ b/bin/v-add-mail-domain-catchall
@ -17,9 +17,9 @@ domain_idn=$(idn -t --quiet -a "$domain")
 email="$3"

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-mail-domain-dkim
+++ b/bin/v-add-mail-domain-dkim
@ -17,9 +17,9 @@ domain_idn=$(idn -t --quiet -a "$domain")
 dkim_size=${3-1024}

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-remote-dns-domain
+++ b/bin/v-add-remote-dns-domain
@ -14,9 +14,9 @@ user=$1
 domain=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-remote-dns-host
+++ b/bin/v-add-remote-dns-host
@ -18,9 +18,9 @@ type=${5-api}
 dns_user=${6-dns-cluster}

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
+source $VESTA/conf/vesta.conf

 # Hiding passwords
 A4='******'
--- a/bin/v-add-remote-dns-record
+++ b/bin/v-add-remote-dns-record
@ -15,9 +15,9 @@ domain=$2
 id=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-sys-ip
+++ b/bin/v-add-sys-ip
@ -24,10 +24,10 @@ ip_name=$6
 nat_ip=$7

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/ip.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-user
+++ b/bin/v-add-user
@ -18,8 +18,8 @@ fname=$5
 lname=$6

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf

 # Hiding password
 A2='******'
--- a/bin/v-add-user-package
+++ b/bin/v-add-user-package
@ -15,8 +15,8 @@ package=$2
 rewrite=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf

 # Functions
 is_package_new() {
--- a/bin/v-add-web-domain
+++ b/bin/v-add-web-domain
@ -24,10 +24,10 @@ ip=$3
 restart=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-web-domain-alias
+++ b/bin/v-add-web-domain-alias
@ -22,10 +22,10 @@ dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
 restart="$4"

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-web-domain-ftp
+++ b/bin/v-add-web-domain-ftp
@ -17,9 +17,9 @@ ftp_user=${1}_${3}
 ftp_password=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf

 # Hiding password
 A4='******'
--- a/bin/v-add-web-domain-proxy
+++ b/bin/v-add-web-domain-proxy
@ -21,10 +21,10 @@ extentions=${4-$default_extentions}
 restart="$5"

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-web-domain-ssl
+++ b/bin/v-add-web-domain-ssl
@ -23,10 +23,10 @@ ssl_home=${4-same}
 restart="$5"

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-web-domain-stats
+++ b/bin/v-add-web-domain-stats
@ -20,9 +20,9 @@ domain_idn=$(idn -t --quiet -a "$domain")
 type=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-add-web-domain-stats-user
+++ b/bin/v-add-web-domain-stats-user
@ -16,9 +16,9 @@ stats_user=$3
 stats_pass=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf

 # Hiding password
 A4='******'
--- a/bin/v-backup-user
+++ b/bin/v-backup-user
@ -14,10 +14,10 @@ user=$1
 notify=${2-no}

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/func/db.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-backup-users
+++ b/bin/v-backup-users
@ -14,8 +14,8 @@
 source /etc/profile

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-cron-job
+++ b/bin/v-change-cron-job
@ -21,8 +21,8 @@ wday=$7
 command=$8

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-database-password
+++ b/bin/v-change-database-password
@ -16,9 +16,9 @@ database=$2
 dbpass=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/db.sh
+source $VESTA/conf/vesta.conf

 # Hiding password
 A3='******'
--- a/bin/v-change-dns-domain-exp
+++ b/bin/v-change-dns-domain-exp
@ -17,8 +17,8 @@ domain_idn=$(idn -t --quiet -a "$domain")
 exp=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-dns-domain-ip
+++ b/bin/v-change-dns-domain-ip
@ -17,9 +17,9 @@ ip=$3
 restart=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-dns-domain-soa
+++ b/bin/v-change-dns-domain-soa
@ -18,9 +18,9 @@ soa=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g')
 restart=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-dns-domain-tpl
+++ b/bin/v-change-dns-domain-tpl
@ -19,9 +19,9 @@ template=$3
 restart=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-dns-domain-ttl
+++ b/bin/v-change-dns-domain-ttl
@ -17,9 +17,9 @@ ttl=$3
 restart=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-dns-record
+++ b/bin/v-change-dns-record
@ -21,9 +21,9 @@ priority=$5
 restart=$6

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-dns-record-id
+++ b/bin/v-change-dns-record-id
@ -19,9 +19,9 @@ newid=$4
 restart=$5

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-mail-account-password
+++ b/bin/v-change-mail-account-password
@ -18,9 +18,9 @@ account=$3
 password=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf

 # Hiding password
 A4='******'
--- a/bin/v-change-mail-account-quota
+++ b/bin/v-change-mail-account-quota
@ -18,9 +18,9 @@ account=$3
 quota=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-mail-domain-catchall
+++ b/bin/v-change-mail-domain-catchall
@ -17,9 +17,9 @@ domain_idn=$(idn -t --quiet -a "$domain")
 email="$3"

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-remote-dns-domain-exp
+++ b/bin/v-change-remote-dns-domain-exp
@ -14,9 +14,9 @@ user=$1
 domain=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-remote-dns-domain-soa
+++ b/bin/v-change-remote-dns-domain-soa
@ -14,9 +14,9 @@ user=$1
 domain=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-remote-dns-domain-ttl
+++ b/bin/v-change-remote-dns-domain-ttl
@ -14,9 +14,9 @@ user=$1
 domain=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-sys-config-value
+++ b/bin/v-change-sys-config-value
@ -15,8 +15,8 @@ key=$(echo "$1" | tr '[:lower:]' '[:upper:]' )
 value=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-sys-ip-name
+++ b/bin/v-change-sys-ip-name
@ -14,9 +14,9 @@ ip=$1
 ip_name=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-sys-ip-nat
+++ b/bin/v-change-sys-ip-nat
@ -15,9 +15,9 @@ nat_ip=$2
 restart=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-sys-ip-owner
+++ b/bin/v-change-sys-ip-owner
@ -14,8 +14,9 @@ ip=$1
 user=$2

 # Includes
-source $VESTA/func/main.sh
 source $VESTA/func/ip.sh
+source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-sys-ip-status
+++ b/bin/v-change-sys-ip-status
@ -16,6 +16,7 @@ ip_status=$2
 # Includes
 source $VESTA/func/main.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-sys-language
+++ b/bin/v-change-sys-language
@ -13,8 +13,8 @@
 language=$1

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 is_language_valid() {
--- a/bin/v-change-user-contact
+++ b/bin/v-change-user-contact
@ -14,8 +14,8 @@ user=$1
 email=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-user-language
+++ b/bin/v-change-user-language
@ -14,8 +14,8 @@ user=$1
 language=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 is_language_valid() {
--- a/bin/v-change-user-name
+++ b/bin/v-change-user-name
@ -15,8 +15,8 @@ fname=$2
 lname=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-user-ns
+++ b/bin/v-change-user-ns
@ -17,8 +17,8 @@ ns3=$4
 ns4=$5

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-user-package
+++ b/bin/v-change-user-package
@ -15,8 +15,8 @@ package=$2
 force=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf

 is_package_avalable() {
    # Parsing user data
--- a/bin/v-change-user-password
+++ b/bin/v-change-user-password
@ -14,8 +14,8 @@ user=$1
 password=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf

 # Hiding password
 A2="******"
--- a/bin/v-change-user-shell
+++ b/bin/v-change-user-shell
@ -14,8 +14,8 @@ user=$1
 shell=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-user-template
+++ b/bin/v-change-user-template
@ -15,9 +15,9 @@ type=$(echo "$2" | tr '[:lower:]' '[:upper:]')
 template=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-web-domain-ftp
+++ b/bin/v-change-web-domain-ftp
@ -17,9 +17,9 @@ ftp_user=${1}_${3}
 ftp_password=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-web-domain-ip
+++ b/bin/v-change-web-domain-ip
@ -17,10 +17,10 @@ ip=$3
 restart=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-web-domain-proxy-tpl
+++ b/bin/v-change-web-domain-proxy-tpl
@ -21,10 +21,10 @@ restart="$5"


 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-web-domain-sslcert
+++ b/bin/v-change-web-domain-sslcert
@ -17,9 +17,9 @@ domain_idn=$(idn -t --quiet -a "$domain")
 ssl_dir=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-web-domain-sslhome
+++ b/bin/v-change-web-domain-sslhome
@ -12,9 +12,9 @@ domain_idn=$(idn -t --quiet -a "$domain")
 ssl_home=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-web-domain-stats
+++ b/bin/v-change-web-domain-stats
@ -17,9 +17,9 @@ domain_idn=$(idn -t --quiet -a "$domain")
 type=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-change-web-domain-tpl
+++ b/bin/v-change-web-domain-tpl
@ -18,10 +18,10 @@ template=$3
 restart=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-backup-ftp-host
+++ b/bin/v-delete-backup-ftp-host
@ -10,8 +10,8 @@
 #----------------------------------------------------------#

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-cron-job
+++ b/bin/v-delete-cron-job
@ -14,8 +14,8 @@ user=$1
 job=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-cron-reports
+++ b/bin/v-delete-cron-reports
@ -14,8 +14,8 @@
 user=$1

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-cron-restart-job
+++ b/bin/v-delete-cron-restart-job
@ -10,8 +10,8 @@
 #----------------------------------------------------------#

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-database
+++ b/bin/v-delete-database
@ -15,9 +15,9 @@ user=$1
 database=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/db.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-database-host
+++ b/bin/v-delete-database-host
@ -15,9 +15,9 @@ type=$1
 host=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/db.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-databases
+++ b/bin/v-delete-databases
@ -13,8 +13,8 @@
 user=$1

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-dns-domain
+++ b/bin/v-delete-dns-domain
@ -16,9 +16,9 @@ domain=$(idn -t --quiet -u "$2" )
 restart="$3"

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-dns-domains
+++ b/bin/v-delete-dns-domains
@ -13,8 +13,8 @@
 user=$1

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-dns-domains-src
+++ b/bin/v-delete-dns-domains-src
@ -15,8 +15,8 @@ src=$2
 restart=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-dns-on-web-alias
+++ b/bin/v-delete-dns-on-web-alias
@ -20,9 +20,9 @@ dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
 restart="$4"

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-dns-record
+++ b/bin/v-delete-dns-record
@ -17,9 +17,9 @@ id=$3
 restart=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-mail-account
+++ b/bin/v-delete-mail-account
@ -17,9 +17,9 @@ domain_idn=$(idn -t --quiet -a "$domain")
 account=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-mail-account-alias
+++ b/bin/v-delete-mail-account-alias
@ -18,9 +18,9 @@ account=$3
 malias=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-mail-account-autoreply
+++ b/bin/v-delete-mail-account-autoreply
@ -18,9 +18,9 @@ account=$3
 malias=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-mail-account-forward
+++ b/bin/v-delete-mail-account-forward
@ -18,9 +18,9 @@ account=$3
 forward=$4

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-mail-domain
+++ b/bin/v-delete-mail-domain
@ -16,9 +16,9 @@ domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-mail-domain-antispam
+++ b/bin/v-delete-mail-domain-antispam
@ -16,9 +16,9 @@ domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
 domain_idn=$(idn -t --quiet -a "$domain")

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-mail-domain-antivirus
+++ b/bin/v-delete-mail-domain-antivirus
@ -16,9 +16,9 @@ domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
 domain_idn=$(idn -t --quiet -a "$domain")

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-mail-domain-catchall
+++ b/bin/v-delete-mail-domain-catchall
@ -16,9 +16,9 @@ domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
 domain_idn=$(idn -t --quiet -a "$domain")

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-mail-domain-dkim
+++ b/bin/v-delete-mail-domain-dkim
@ -15,9 +15,9 @@ domain=$(idn -t --quiet -u "$2" )
 domain=$(echo $domain | tr '[:upper:]' '[:lower:]')

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-mail-domains
+++ b/bin/v-delete-mail-domains
@ -13,8 +13,8 @@
 user=$1

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-remote-dns-domain
+++ b/bin/v-delete-remote-dns-domain
@ -14,9 +14,9 @@ user=$1
 domain=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-remote-dns-domains
+++ b/bin/v-delete-remote-dns-domains
@ -12,9 +12,9 @@
 host=$1

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-remote-dns-host
+++ b/bin/v-delete-remote-dns-host
@ -13,9 +13,9 @@
 host=$1

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-remote-dns-record
+++ b/bin/v-delete-remote-dns-record
@ -15,9 +15,9 @@ domain=$2
 id=$3

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-sys-ip
+++ b/bin/v-delete-sys-ip
@ -14,10 +14,10 @@
 ip=$1

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/ip.sh
 source $VESTA/func/domain.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-user
+++ b/bin/v-delete-user
@ -15,11 +15,11 @@ user=$1
 restart=$2

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/func/db.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-user-backup
+++ b/bin/v-delete-user-backup
@ -14,8 +14,8 @@ user=$1
 backup=$(echo $2| cut -f 2 -d \.)

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/bin/v-delete-user-ips
+++ b/bin/v-delete-user-ips
@ -13,9 +13,9 @@
 user=$1

 # Includes
-source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/ip.sh
+source $VESTA/conf/vesta.conf


 #----------------------------------------------------------#
--- a/Show more
+++ b/Show more