diff --git a/bin/v-add-backup-ftp-host b/bin/v-add-backup-ftp-host index 88f5ebcc..85a6ae02 100755 --- 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() { diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job index 78a3a3d2..3857668a 100755 --- 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" diff --git a/bin/v-add-cron-report b/bin/v-add-cron-report index 0cf30a22..f42ade3a 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-cron-restart-job b/bin/v-add-cron-restart-job index 322279c7..b751c9ad 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-database b/bin/v-add-database index a2bec1f6..5451694f 100755 --- 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='******' diff --git a/bin/v-add-database-host b/bin/v-add-database-host index e5045b41..12cd0f9a 100755 --- 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='******' diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain index fe6117fd..582db238 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-dns-on-web-alias b/bin/v-add-dns-on-web-alias index aa6e6b7c..c6e5a853 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index 1c97b3ab..6253ba2d 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-domain b/bin/v-add-domain index d7de6689..32e56214 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account index f83ba961..6e2cccf3 100755 --- 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='******' diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias index b3074c14..844e5805 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-mail-account-autoreply b/bin/v-add-mail-account-autoreply index d7faf161..ab0e57b9 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward index 186878b3..f566c14f 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index a02ff5c7..1051567d 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain-antispam b/bin/v-add-mail-domain-antispam index 923e49fc..e15b379e 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain-antivirus b/bin/v-add-mail-domain-antivirus index f0970b2a..2f55abad 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall index 4c6472cf..213feeb5 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim index c5b6fbde..8c4726c5 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-remote-dns-domain b/bin/v-add-remote-dns-domain index 0eb33326..3cf38a5e 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-remote-dns-host b/bin/v-add-remote-dns-host index 238288a2..a9bdd25c 100755 --- 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='******' diff --git a/bin/v-add-remote-dns-record b/bin/v-add-remote-dns-record index d559f2fd..0dce7e54 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip index 1a7f31d2..4acd375a 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-user b/bin/v-add-user index f72fe2ea..0bda5b0b 100755 --- 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='******' diff --git a/bin/v-add-user-package b/bin/v-add-user-package index e2ddd7fc..e4f7883b 100755 --- 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() { diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index d76e2524..048da8ea 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias index 06099471..b8000d39 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index 7355660b..e416ab91 100755 --- 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='******' diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy index 06442781..cd3d733b 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl index 9c3a103f..d5baefd0 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-web-domain-stats b/bin/v-add-web-domain-stats index bdc8f930..7b5ad3c2 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-add-web-domain-stats-user b/bin/v-add-web-domain-stats-user index 4404e641..b0515c87 100755 --- 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='******' diff --git a/bin/v-backup-user b/bin/v-backup-user index edd20e91..7986ef26 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-backup-users b/bin/v-backup-users index 82837d3c..f368259b 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-cron-job b/bin/v-change-cron-job index 7d7780e0..ae90ffc1 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-database-password b/bin/v-change-database-password index 870a2683..cabb7770 100755 --- 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='******' diff --git a/bin/v-change-dns-domain-exp b/bin/v-change-dns-domain-exp index 08623135..cbc2da54 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index 6488bb82..ec51ae22 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index 875bc727..48e2851b 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index 22222165..504f9b89 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index 88c50813..690f57ba 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index c46727f5..8fed2ca3 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id index 0f76290a..7daeb5fa 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password index 57e2331e..8b7b6c6b 100755 --- 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='******' diff --git a/bin/v-change-mail-account-quota b/bin/v-change-mail-account-quota index 3e294958..c8b736d9 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall index 4525f4b2..449e616f 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-remote-dns-domain-exp b/bin/v-change-remote-dns-domain-exp index 53e5ece5..69f3450f 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-remote-dns-domain-soa b/bin/v-change-remote-dns-domain-soa index 18765901..772695b4 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-remote-dns-domain-ttl b/bin/v-change-remote-dns-domain-ttl index 680ad0c1..5aa3c547 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-sys-config-value b/bin/v-change-sys-config-value index d81d7735..2e06192e 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-sys-ip-name b/bin/v-change-sys-ip-name index f96b96a0..8b3a5ef7 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-sys-ip-nat b/bin/v-change-sys-ip-nat index 004d3325..b3b4f926 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-sys-ip-owner b/bin/v-change-sys-ip-owner index ed8e447e..0fe37ddc 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-sys-ip-status b/bin/v-change-sys-ip-status index 761d6133..30f00254 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-sys-language b/bin/v-change-sys-language index f0be8ce8..358a143e 100755 --- 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() { diff --git a/bin/v-change-user-contact b/bin/v-change-user-contact index 7f21aece..2a803cf5 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-user-language b/bin/v-change-user-language index e2f10418..3bc437a8 100755 --- 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() { diff --git a/bin/v-change-user-name b/bin/v-change-user-name index 26e90872..9cbecc59 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-user-ns b/bin/v-change-user-ns index 561eba7f..d4c1796f 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-user-package b/bin/v-change-user-package index 95189ca5..b00c38f2 100755 --- 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 diff --git a/bin/v-change-user-password b/bin/v-change-user-password index f5c3ab7e..89c376ad 100755 --- 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="******" diff --git a/bin/v-change-user-shell b/bin/v-change-user-shell index 2431447b..f533d43c 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-user-template b/bin/v-change-user-template index cddfcbdc..465b0709 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-ftp b/bin/v-change-web-domain-ftp index 682d4855..a69cf510 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip index 177e3696..de88ca78 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl index 90f09c47..e276868b 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index ec17f4f2..204b2e3d 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome index dbc7a476..c2b360f2 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-stats b/bin/v-change-web-domain-stats index 5ed571c0..5fe510ca 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl index a434e2f9..ff7ae835 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-backup-ftp-host b/bin/v-delete-backup-ftp-host index 0e92e26e..d9c27318 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job index f85e04bf..3a62618d 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-cron-reports b/bin/v-delete-cron-reports index 7073d62d..df70b30a 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-cron-restart-job b/bin/v-delete-cron-restart-job index 6baf07cd..5876ba3b 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-database b/bin/v-delete-database index f42cc26f..7257f85d 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-database-host b/bin/v-delete-database-host index c3a90930..fe6f3db7 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-databases b/bin/v-delete-databases index e2679cbe..cb142131 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain index 4ed6fd3c..774f5381 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-dns-domains b/bin/v-delete-dns-domains index a425d06f..7e94eae9 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-dns-domains-src b/bin/v-delete-dns-domains-src index fb2b77fc..8c9f4de4 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-dns-on-web-alias b/bin/v-delete-dns-on-web-alias index 22e9c629..e3eb69ed 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record index 6b23a1c0..f1fc304e 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account index 5f318058..b242ab24 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias index 5f5a572a..7934c5b6 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply index ecc7cd6d..fcbe088d 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward index 8fa77395..2a16ad21 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain index 9aecc6bd..3729d81f 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain-antispam b/bin/v-delete-mail-domain-antispam index 1a23ac1e..41c902be 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain-antivirus b/bin/v-delete-mail-domain-antivirus index 3b6e0f05..cfec16ce 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall index c09fa7ea..52b3e942 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain-dkim b/bin/v-delete-mail-domain-dkim index e15c17c0..c0846ded 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domains b/bin/v-delete-mail-domains index ef7feed6..ae415381 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-remote-dns-domain b/bin/v-delete-remote-dns-domain index c08683bb..326d3c69 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-remote-dns-domains b/bin/v-delete-remote-dns-domains index db3a250b..c2e2300f 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-remote-dns-host b/bin/v-delete-remote-dns-host index d44c046b..968e02f7 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-remote-dns-record b/bin/v-delete-remote-dns-record index c92890b5..29102f6e 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip index 6654b5c6..fa69f333 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-user b/bin/v-delete-user index ad2930a4..d05cc7d9 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-user-backup b/bin/v-delete-user-backup index 9e02ec76..a56ac8a7 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-user-ips b/bin/v-delete-user-ips index bf7b0640..a6125333 100755 --- 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 #----------------------------------------------------------# diff --git a/bin/v-delete-user-package b/bin/v-delete-user-package index d9862acd..db5bdaab 100755 --- a/bin/v-delete-user-package +++ b/bin/v-delete-user-package @@ -14,8 +14,8 @@ package=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf # Functions is_package_in_use() { diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index 0748f207..edba9747 100755 --- a/bin/v-delete-web-domain +++ b/bin/v-delete-web-domain @@ -19,10 +19,10 @@ domain_idn=$(idn -t --quiet -a "$domain") restart=$3 # 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 #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias index 0ed2f584..c7b66a47 100755 --- a/bin/v-delete-web-domain-alias +++ b/bin/v-delete-web-domain-alias @@ -19,10 +19,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 #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp index 9c9e6b66..2b776e30 100755 --- a/bin/v-delete-web-domain-ftp +++ b/bin/v-delete-web-domain-ftp @@ -15,9 +15,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 #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy index b9ac21d3..20c4ff4a 100755 --- a/bin/v-delete-web-domain-proxy +++ b/bin/v-delete-web-domain-proxy @@ -16,9 +16,9 @@ domain_idn=$(idn -t --quiet -a "$domain") restart=$3 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index 019ee71f..61d0072d 100755 --- a/bin/v-delete-web-domain-ssl +++ b/bin/v-delete-web-domain-ssl @@ -16,9 +16,9 @@ domain_idn=$(idn -t --quiet -a "$domain") restart=$3 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-stats b/bin/v-delete-web-domain-stats index 9da021e0..3d2292a9 100755 --- a/bin/v-delete-web-domain-stats +++ b/bin/v-delete-web-domain-stats @@ -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 #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-stats-user b/bin/v-delete-web-domain-stats-user index 526d682a..877f5482 100755 --- a/bin/v-delete-web-domain-stats-user +++ b/bin/v-delete-web-domain-stats-user @@ -17,9 +17,9 @@ user=$1 domain=$(idn -t --quiet -u "$2" ) # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-delete-web-domains b/bin/v-delete-web-domains index 6c4f860d..ff7052c8 100755 --- a/bin/v-delete-web-domains +++ b/bin/v-delete-web-domains @@ -14,8 +14,8 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-get-user-value b/bin/v-get-user-value index f5eeb99d..c51082e6 100755 --- a/bin/v-get-user-value +++ b/bin/v-get-user-value @@ -14,7 +14,6 @@ user=$1 key=$(echo "$2"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh diff --git a/bin/v-get-web-domain-value b/bin/v-get-web-domain-value index f1529da6..16ae5c84 100755 --- a/bin/v-get-web-domain-value +++ b/bin/v-get-web-domain-value @@ -18,9 +18,9 @@ domain_idn=$(idn -t --quiet -a "$domain") key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain index 2f928f4e..d8b1017d 100755 --- a/bin/v-insert-dns-domain +++ b/bin/v-insert-dns-domain @@ -17,9 +17,9 @@ flush=$4 restart=$5 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-insert-dns-record b/bin/v-insert-dns-record index 87b433df..cd888471 100755 --- a/bin/v-insert-dns-record +++ b/bin/v-insert-dns-record @@ -16,8 +16,8 @@ data=$3 restart=$4 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-insert-dns-records b/bin/v-insert-dns-records index 99a48a20..302951e7 100755 --- a/bin/v-insert-dns-records +++ b/bin/v-insert-dns-records @@ -16,8 +16,8 @@ data_file=$3 restart=$4 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-list-sys-services b/bin/v-list-sys-services index fbf213fd..3560f95a 100755 --- a/bin/v-list-sys-services +++ b/bin/v-list-sys-services @@ -13,8 +13,8 @@ format=${1-shell} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf get_srv_state() { srv=$1 diff --git a/bin/v-list-web-domain-accesslog b/bin/v-list-web-domain-accesslog index 8bf4c595..9fdff009 100755 --- a/bin/v-list-web-domain-accesslog +++ b/bin/v-list-web-domain-accesslog @@ -15,9 +15,8 @@ domain=$2 lines=${3-70} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh - +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-list-web-domain-errorlog b/bin/v-list-web-domain-errorlog index a3957474..04520213 100755 --- a/bin/v-list-web-domain-errorlog +++ b/bin/v-list-web-domain-errorlog @@ -15,9 +15,8 @@ domain=$2 lines=${3-70} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh - +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-list-web-templates b/bin/v-list-web-templates index 3ad09584..d54bfc45 100755 --- a/bin/v-list-web-templates +++ b/bin/v-list-web-templates @@ -13,8 +13,8 @@ format=${1-shell} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf # Json function json_list_wtpl() { diff --git a/bin/v-list-web-templates-proxy b/bin/v-list-web-templates-proxy index 9fa71207..35d4e35d 100755 --- a/bin/v-list-web-templates-proxy +++ b/bin/v-list-web-templates-proxy @@ -13,8 +13,8 @@ format=${1-shell} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf # Json function json_list_wtpl() { diff --git a/bin/v-rebuild-cron-jobs b/bin/v-rebuild-cron-jobs index c0ac562e..0edc1909 100755 --- a/bin/v-rebuild-cron-jobs +++ b/bin/v-rebuild-cron-jobs @@ -14,8 +14,8 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-rebuild-databases b/bin/v-rebuild-databases index 2a33b060..bf9d1d30 100755 --- a/bin/v-rebuild-databases +++ b/bin/v-rebuild-databases @@ -13,10 +13,10 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/db.sh source $VESTA/func/rebuild.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain index cf92573c..564b2aaa 100755 --- a/bin/v-rebuild-dns-domain +++ b/bin/v-rebuild-dns-domain @@ -15,10 +15,10 @@ domain=$2 restart=$3 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/rebuild.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains index 7e48bb7d..2fd2aeee 100755 --- a/bin/v-rebuild-dns-domains +++ b/bin/v-rebuild-dns-domains @@ -14,10 +14,10 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/rebuild.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-rebuild-mail-domains b/bin/v-rebuild-mail-domains index ef41c3bf..4373ddb5 100755 --- a/bin/v-rebuild-mail-domains +++ b/bin/v-rebuild-mail-domains @@ -13,10 +13,10 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/rebuild.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-rebuild-user b/bin/v-rebuild-user index 5b63460c..63aaa35d 100755 --- a/bin/v-rebuild-user +++ b/bin/v-rebuild-user @@ -14,9 +14,9 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/rebuild.sh +source $VESTA/conf/vesta.conf # Export sbin export PATH=$PATH:/usr/sbin diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index f088950f..a8c54656 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -14,11 +14,11 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/ip.sh source $VESTA/func/rebuild.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-restart-cron b/bin/v-restart-cron index 8bb317b4..03e2f9aa 100755 --- a/bin/v-restart-cron +++ b/bin/v-restart-cron @@ -10,8 +10,8 @@ #----------------------------------------------------------# # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-restart-dns b/bin/v-restart-dns index 12778e14..1bebb6d4 100755 --- a/bin/v-restart-dns +++ b/bin/v-restart-dns @@ -10,8 +10,8 @@ #----------------------------------------------------------# # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-restart-ftp b/bin/v-restart-ftp index 0f0bc6d5..32454a4c 100755 --- a/bin/v-restart-ftp +++ b/bin/v-restart-ftp @@ -10,8 +10,8 @@ #----------------------------------------------------------# # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-restart-mail b/bin/v-restart-mail index b7bba97c..96d601e5 100755 --- a/bin/v-restart-mail +++ b/bin/v-restart-mail @@ -10,8 +10,8 @@ #----------------------------------------------------------# # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-restart-proxy b/bin/v-restart-proxy index ad269e3c..e66c8067 100755 --- a/bin/v-restart-proxy +++ b/bin/v-restart-proxy @@ -10,8 +10,8 @@ #----------------------------------------------------------# # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-restart-web b/bin/v-restart-web index 27e734f9..5a4188ec 100755 --- a/bin/v-restart-web +++ b/bin/v-restart-web @@ -10,8 +10,8 @@ #----------------------------------------------------------# # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-restore-user b/bin/v-restore-user index c6e3ec9f..24642f5a 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -29,12 +29,12 @@ if [ -z "$BACKUP" ]; then fi # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/ip.sh source $VESTA/func/db.sh source $VESTA/func/rebuild.sh +source $VESTA/conf/vesta.conf # Check backup function is_backup_valid() { diff --git a/bin/v-schedule-user-backup b/bin/v-schedule-user-backup index 9c8bab47..066edecd 100755 --- a/bin/v-schedule-user-backup +++ b/bin/v-schedule-user-backup @@ -13,8 +13,8 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-schedule-user-restore b/bin/v-schedule-user-restore index 476b9bdf..44d1e66b 100755 --- a/bin/v-schedule-user-restore +++ b/bin/v-schedule-user-restore @@ -20,8 +20,8 @@ cron=$7 udir=$8 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-search-object b/bin/v-search-object index 7c4185ad..a7bdf3aa 100755 --- a/bin/v-search-object +++ b/bin/v-search-object @@ -14,8 +14,8 @@ object=$1 format=${2-shell} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf # Json list function json_list_search() { diff --git a/bin/v-search-user-object b/bin/v-search-user-object index 86e4bbcf..74637500 100755 --- a/bin/v-search-user-object +++ b/bin/v-search-user-object @@ -15,8 +15,8 @@ object=$2 format=${3-shell} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf # Json list function json_list_search() { diff --git a/bin/v-suspend-cron-job b/bin/v-suspend-cron-job index adeff7d8..393ddda9 100755 --- a/bin/v-suspend-cron-job +++ b/bin/v-suspend-cron-job @@ -15,8 +15,8 @@ job=$2 restart=$3 # Inlcudes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-suspend-cron-jobs b/bin/v-suspend-cron-jobs index e8daf6e8..cd6b3077 100755 --- a/bin/v-suspend-cron-jobs +++ b/bin/v-suspend-cron-jobs @@ -14,8 +14,8 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-suspend-database b/bin/v-suspend-database index a39c352f..1f776519 100755 --- a/bin/v-suspend-database +++ b/bin/v-suspend-database @@ -14,9 +14,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 #----------------------------------------------------------# diff --git a/bin/v-suspend-database-host b/bin/v-suspend-database-host index 24fb8119..7ed06316 100755 --- a/bin/v-suspend-database-host +++ b/bin/v-suspend-database-host @@ -14,8 +14,8 @@ type=$1 host=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-suspend-databases b/bin/v-suspend-databases index 9da8eed5..53ed4cec 100755 --- a/bin/v-suspend-databases +++ b/bin/v-suspend-databases @@ -13,8 +13,8 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain index f0fa5f40..25b43034 100755 --- a/bin/v-suspend-dns-domain +++ b/bin/v-suspend-dns-domain @@ -16,8 +16,8 @@ domain_idn=$(idn -t --quiet -a "$domain") restart="$3" # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-suspend-dns-domains b/bin/v-suspend-dns-domains index 2c54d57e..e6083e5d 100755 --- a/bin/v-suspend-dns-domains +++ b/bin/v-suspend-dns-domains @@ -14,8 +14,8 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record index f14d89f9..417c3add 100755 --- a/bin/v-suspend-dns-record +++ b/bin/v-suspend-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 #----------------------------------------------------------# diff --git a/bin/v-suspend-mail-account b/bin/v-suspend-mail-account index 652cd28a..e5b75c74 100755 --- a/bin/v-suspend-mail-account +++ b/bin/v-suspend-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 #----------------------------------------------------------# diff --git a/bin/v-suspend-mail-accounts b/bin/v-suspend-mail-accounts index 45a9e37d..9cc393f2 100755 --- a/bin/v-suspend-mail-accounts +++ b/bin/v-suspend-mail-accounts @@ -16,8 +16,8 @@ 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/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-suspend-mail-domain b/bin/v-suspend-mail-domain index 1291da08..3e5001bc 100755 --- a/bin/v-suspend-mail-domain +++ b/bin/v-suspend-mail-domain @@ -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 #----------------------------------------------------------# diff --git a/bin/v-suspend-mail-domains b/bin/v-suspend-mail-domains index ac81e3c7..db52c5d4 100755 --- a/bin/v-suspend-mail-domains +++ b/bin/v-suspend-mail-domains @@ -13,9 +13,9 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-suspend-user b/bin/v-suspend-user index ed4534b6..5a754d05 100755 --- a/bin/v-suspend-user +++ b/bin/v-suspend-user @@ -14,8 +14,8 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain index 7e7933bf..005b8152 100755 --- a/bin/v-suspend-web-domain +++ b/bin/v-suspend-web-domain @@ -18,10 +18,10 @@ domain_idn=$(idn -t --quiet -a "$domain") restart=$3 # 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 #----------------------------------------------------------# diff --git a/bin/v-suspend-web-domains b/bin/v-suspend-web-domains index e772e07f..29e07c6a 100755 --- a/bin/v-suspend-web-domains +++ b/bin/v-suspend-web-domains @@ -14,9 +14,9 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-sync-dns-cluster b/bin/v-sync-dns-cluster index f563c8be..cf4be247 100755 --- a/bin/v-sync-dns-cluster +++ b/bin/v-sync-dns-cluster @@ -13,9 +13,9 @@ host=$1 verbose=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/remote.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-unsuspend-cron-job b/bin/v-unsuspend-cron-job index dddb20fe..8a184691 100755 --- a/bin/v-unsuspend-cron-job +++ b/bin/v-unsuspend-cron-job @@ -15,8 +15,8 @@ job=$2 restart="${3-yes}" # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-unsuspend-cron-jobs b/bin/v-unsuspend-cron-jobs index d9fabab4..0f3994fa 100755 --- a/bin/v-unsuspend-cron-jobs +++ b/bin/v-unsuspend-cron-jobs @@ -14,8 +14,8 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-unsuspend-database b/bin/v-unsuspend-database index 228f0fe1..5a75ba3b 100755 --- a/bin/v-unsuspend-database +++ b/bin/v-unsuspend-database @@ -14,9 +14,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 #----------------------------------------------------------# diff --git a/bin/v-unsuspend-database-host b/bin/v-unsuspend-database-host index a9318cb5..2d2a0dc7 100755 --- a/bin/v-unsuspend-database-host +++ b/bin/v-unsuspend-database-host @@ -14,8 +14,8 @@ type=$1 host=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-unsuspend-databases b/bin/v-unsuspend-databases index 719e8778..fcf9dc62 100755 --- a/bin/v-unsuspend-databases +++ b/bin/v-unsuspend-databases @@ -13,9 +13,9 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/db.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain index 0dae8d56..4e91f514 100755 --- a/bin/v-unsuspend-dns-domain +++ b/bin/v-unsuspend-dns-domain @@ -16,8 +16,8 @@ domain_idn=$(idn -t --quiet -a "$domain") restart="$3" # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-unsuspend-dns-domains b/bin/v-unsuspend-dns-domains index 7246cb50..0807912a 100755 --- a/bin/v-unsuspend-dns-domains +++ b/bin/v-unsuspend-dns-domains @@ -14,8 +14,8 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record index 505b0873..3d9d048f 100755 --- a/bin/v-unsuspend-dns-record +++ b/bin/v-unsuspend-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 #----------------------------------------------------------# diff --git a/bin/v-unsuspend-mail-account b/bin/v-unsuspend-mail-account index f3d991fc..776d1f92 100755 --- a/bin/v-unsuspend-mail-account +++ b/bin/v-unsuspend-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 #----------------------------------------------------------# diff --git a/bin/v-unsuspend-mail-accounts b/bin/v-unsuspend-mail-accounts index d82a0e8b..6db20f07 100755 --- a/bin/v-unsuspend-mail-accounts +++ b/bin/v-unsuspend-mail-accounts @@ -16,8 +16,8 @@ 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/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-unsuspend-mail-domain b/bin/v-unsuspend-mail-domain index 9b3f1b9e..d9c00449 100755 --- a/bin/v-unsuspend-mail-domain +++ b/bin/v-unsuspend-mail-domain @@ -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 #----------------------------------------------------------# diff --git a/bin/v-unsuspend-mail-domains b/bin/v-unsuspend-mail-domains index 7730d3e9..19321a53 100755 --- a/bin/v-unsuspend-mail-domains +++ b/bin/v-unsuspend-mail-domains @@ -13,9 +13,9 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-unsuspend-user b/bin/v-unsuspend-user index 5bb8f3eb..47618a4e 100755 --- a/bin/v-unsuspend-user +++ b/bin/v-unsuspend-user @@ -14,8 +14,8 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain index 59fba032..eaae49e5 100755 --- a/bin/v-unsuspend-web-domain +++ b/bin/v-unsuspend-web-domain @@ -16,10 +16,10 @@ domain_idn=$(idn -t --quiet -a "$domain") restart="$3" # 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 #----------------------------------------------------------# diff --git a/bin/v-unsuspend-web-domains b/bin/v-unsuspend-web-domains index f33dd10f..d60d0727 100755 --- a/bin/v-unsuspend-web-domains +++ b/bin/v-unsuspend-web-domains @@ -14,9 +14,9 @@ user=$1 restart=$2 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-database-disk b/bin/v-update-database-disk index 22f225e6..fe034619 100755 --- a/bin/v-update-database-disk +++ b/bin/v-update-database-disk @@ -14,9 +14,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 #----------------------------------------------------------# diff --git a/bin/v-update-databases-disk b/bin/v-update-databases-disk index e5059ea4..a6ca5b94 100755 --- a/bin/v-update-databases-disk +++ b/bin/v-update-databases-disk @@ -13,8 +13,8 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-dns-templates b/bin/v-update-dns-templates index 32e227cd..677f2b66 100755 --- a/bin/v-update-dns-templates +++ b/bin/v-update-dns-templates @@ -13,8 +13,8 @@ restart=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-mail-domain-disk b/bin/v-update-mail-domain-disk index 186ea027..4e59c6a6 100755 --- a/bin/v-update-mail-domain-disk +++ b/bin/v-update-mail-domain-disk @@ -16,8 +16,8 @@ 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/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-mail-domains-disk b/bin/v-update-mail-domains-disk index f1f7a828..79dcb244 100755 --- a/bin/v-update-mail-domains-disk +++ b/bin/v-update-mail-domains-disk @@ -13,8 +13,8 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip index 8829aff7..41857385 100755 --- a/bin/v-update-sys-ip +++ b/bin/v-update-sys-ip @@ -16,8 +16,8 @@ user=${1-admin} ip_status=${2-shared} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-ip-counters b/bin/v-update-sys-ip-counters index fdf05e0f..f25d5b12 100755 --- a/bin/v-update-sys-ip-counters +++ b/bin/v-update-sys-ip-counters @@ -13,9 +13,9 @@ ip=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/ip.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-queue b/bin/v-update-sys-queue index 7a8a2c65..67225e6b 100755 --- a/bin/v-update-sys-queue +++ b/bin/v-update-sys-queue @@ -20,8 +20,8 @@ queue=$1 source /etc/profile # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf # Export PATH for cron PATH=$PATH:$BIN diff --git a/bin/v-update-sys-rrd b/bin/v-update-sys-rrd index 42a1f044..6420f607 100755 --- a/bin/v-update-sys-rrd +++ b/bin/v-update-sys-rrd @@ -15,8 +15,8 @@ source /etc/profile # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf # Another workaround for cron enviroment PATH="$PATH:$BIN" diff --git a/bin/v-update-sys-rrd-apache2 b/bin/v-update-sys-rrd-apache2 index 7a51b132..885882be 100755 --- a/bin/v-update-sys-rrd-apache2 +++ b/bin/v-update-sys-rrd-apache2 @@ -13,8 +13,8 @@ period=${1-daily} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-rrd-ftp b/bin/v-update-sys-rrd-ftp index 4436f282..8f926a4e 100755 --- a/bin/v-update-sys-rrd-ftp +++ b/bin/v-update-sys-rrd-ftp @@ -13,8 +13,8 @@ period=${1-daily} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-rrd-httpd b/bin/v-update-sys-rrd-httpd index 620631c6..fefcb005 100755 --- a/bin/v-update-sys-rrd-httpd +++ b/bin/v-update-sys-rrd-httpd @@ -13,8 +13,8 @@ period=${1-daily} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-rrd-la b/bin/v-update-sys-rrd-la index da63024b..d0093777 100755 --- a/bin/v-update-sys-rrd-la +++ b/bin/v-update-sys-rrd-la @@ -13,8 +13,8 @@ period=${1-daily} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-rrd-mem b/bin/v-update-sys-rrd-mem index 85269b82..21e35970 100755 --- a/bin/v-update-sys-rrd-mem +++ b/bin/v-update-sys-rrd-mem @@ -13,8 +13,8 @@ period=${1-daily} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-rrd-mysql b/bin/v-update-sys-rrd-mysql index 1c8cc581..d2f24824 100755 --- a/bin/v-update-sys-rrd-mysql +++ b/bin/v-update-sys-rrd-mysql @@ -13,8 +13,8 @@ period=${1-daily} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-rrd-net b/bin/v-update-sys-rrd-net index 266c93b5..d493f7a0 100755 --- a/bin/v-update-sys-rrd-net +++ b/bin/v-update-sys-rrd-net @@ -13,8 +13,8 @@ period=${1-daily} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-rrd-nginx b/bin/v-update-sys-rrd-nginx index 6f2664e1..7b75f7a7 100755 --- a/bin/v-update-sys-rrd-nginx +++ b/bin/v-update-sys-rrd-nginx @@ -13,8 +13,8 @@ period=${1-daily} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-rrd-pgsql b/bin/v-update-sys-rrd-pgsql index 985dc4f2..18eaa2ef 100755 --- a/bin/v-update-sys-rrd-pgsql +++ b/bin/v-update-sys-rrd-pgsql @@ -13,8 +13,8 @@ period=${1-daily} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-rrd-ssh b/bin/v-update-sys-rrd-ssh index 814f3878..aaaa8b97 100755 --- a/bin/v-update-sys-rrd-ssh +++ b/bin/v-update-sys-rrd-ssh @@ -13,8 +13,8 @@ period=${1-daily} # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-sys-vesta b/bin/v-update-sys-vesta index 6e2411d8..f6bebe0e 100755 --- a/bin/v-update-sys-vesta +++ b/bin/v-update-sys-vesta @@ -17,8 +17,8 @@ package=$1 source /etc/profile # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-user-backups b/bin/v-update-user-backups index c09f4460..bb227800 100755 --- a/bin/v-update-user-backups +++ b/bin/v-update-user-backups @@ -10,8 +10,8 @@ #----------------------------------------------------------# # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf # Argument defenition user=$1 diff --git a/bin/v-update-user-counters b/bin/v-update-user-counters index 8418ddbf..e6c67c0d 100755 --- a/bin/v-update-user-counters +++ b/bin/v-update-user-counters @@ -13,8 +13,8 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-user-disk b/bin/v-update-user-disk index ba3fdc17..d129a94c 100755 --- a/bin/v-update-user-disk +++ b/bin/v-update-user-disk @@ -13,8 +13,8 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-user-package b/bin/v-update-user-package index 780d21b2..1b524b09 100755 --- a/bin/v-update-user-package +++ b/bin/v-update-user-package @@ -13,8 +13,8 @@ package=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-user-stats b/bin/v-update-user-stats index e1416538..b6b3c999 100755 --- a/bin/v-update-user-stats +++ b/bin/v-update-user-stats @@ -17,9 +17,9 @@ user=$1 source /etc/profile # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-web-domain-disk b/bin/v-update-web-domain-disk index 7f447d37..6ffdee82 100755 --- a/bin/v-update-web-domain-disk +++ b/bin/v-update-web-domain-disk @@ -15,9 +15,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 #----------------------------------------------------------# diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat index 64c2107d..6c617faa 100755 --- a/bin/v-update-web-domain-stat +++ b/bin/v-update-web-domain-stat @@ -15,9 +15,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 #----------------------------------------------------------# diff --git a/bin/v-update-web-domain-traff b/bin/v-update-web-domain-traff index 53069f5e..47f2ae92 100755 --- a/bin/v-update-web-domain-traff +++ b/bin/v-update-web-domain-traff @@ -15,9 +15,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 #----------------------------------------------------------# diff --git a/bin/v-update-web-domains-disk b/bin/v-update-web-domains-disk index 2c94a051..9f8c2a52 100755 --- a/bin/v-update-web-domains-disk +++ b/bin/v-update-web-domains-disk @@ -13,8 +13,8 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-web-domains-stat b/bin/v-update-web-domains-stat index 31bf0782..6f2f20f4 100755 --- a/bin/v-update-web-domains-stat +++ b/bin/v-update-web-domains-stat @@ -13,9 +13,9 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-web-domains-traff b/bin/v-update-web-domains-traff index 2a93e3a7..d8a2e924 100755 --- a/bin/v-update-web-domains-traff +++ b/bin/v-update-web-domains-traff @@ -13,9 +13,9 @@ user=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------# diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates index 57c8ef3b..7fbdde7b 100755 --- a/bin/v-update-web-templates +++ b/bin/v-update-web-templates @@ -13,8 +13,8 @@ restart=$1 # Includes -source $VESTA/conf/vesta.conf source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf #----------------------------------------------------------#