from now vesta.conf can override any func variable

Author: serghey-rodin

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() {

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"

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

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

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='******'

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='******'

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

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

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

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