diff --git a/bin/v-add-backup-ftp-host b/bin/v-add-backup-ftp-host index 88f5ebcc5..85a6ae022 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 78a3a3d26..3857668a7 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 0cf30a229..f42ade3a5 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 322279c76..b751c9adb 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 a2bec1f6f..5451694f5 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 e5045b410..12cd0f9ab 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 fe6117fdb..582db2382 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 aa6e6b7c2..c6e5a8532 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 1c97b3ab5..6253ba2d4 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 d7de66891..32e56214c 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 f83ba961b..6e2cccf3b 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 b3074c14b..844e58051 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 d7faf1619..ab0e57b9e 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 186878b39..f566c14fa 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 a02ff5c7e..1051567db 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 923e49fc4..e15b379e0 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 f0970b2a8..2f55abad6 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 4c6472cf9..213feeb56 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 c5b6fbdeb..8c4726c51 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 0eb33326c..3cf38a5e4 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 238288a25..a9bdd25c4 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 d559f2fd2..0dce7e540 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 1a7f31d25..4acd375aa 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 f72fe2eaf..0bda5b0bb 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 e2ddd7fca..e4f7883ba 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 d76e25248..048da8ea8 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 060994711..b8000d398 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 7355660b0..e416ab911 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 064427814..cd3d733ba 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 9c3a103fb..d5baefd00 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 bdc8f930d..7b5ad3c2b 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 4404e6418..b0515c87f 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 edd20e913..7986ef260 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 82837d3cb..f368259b5 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 7d7780e06..ae90ffc18 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 870a2683d..cabb7770b 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 08623135b..cbc2da54e 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 6488bb826..ec51ae22a 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 875bc7275..48e2851ba 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 22222165e..504f9b89e 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 88c50813e..690f57ba6 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 c46727f59..8fed2ca32 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 0f76290a6..7daeb5fa1 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 57e2331e3..8b7b6c6b6 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 3e2949584..c8b736d9b 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 4525f4b27..449e616f4 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 53e5ece55..69f3450f3 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 18765901f..772695b43 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 680ad0c1e..5aa3c5477 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 d81d77356..2e06192e1 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 f96b96a02..8b3a5ef7d 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 004d33250..b3b4f9268 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 ed8e447e3..0fe37ddc4 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 761d61331..30f00254e 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 f0be8ce8c..358a143e6 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 7f21aece9..2a803cf56 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 e2f104184..3bc437a84 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 26e908720..9cbecc596 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 561eba7f9..d4c1796f5 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 95189ca5a..b00c38f28 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 f5c3ab7e0..89c376ada 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 2431447bd..f533d43c3 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 cddfcbdcb..465b07097 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 682d48551..a69cf510e 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 177e3696e..de88ca78b 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 90f09c475..e276868b1 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 ec17f4f2c..204b2e3d7 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 dbc7a4764..c2b360f2b 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 5ed571c00..5fe510ca0 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 a434e2f99..ff7ae8353 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 0e92e26e1..d9c27318d 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 f85e04bf2..3a62618d5 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 7073d62d5..df70b30a7 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 6baf07cd8..5876ba3b9 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 f42cc26f5..7257f85d7 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 c3a90930c..fe6f3db78 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 e2679cbe4..cb1421314 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 4ed6fd3cf..774f53819 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 a425d06f4..7e94eae96 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 fb2b77fcf..8c9f4de4e 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 22e9c6298..e3eb69edf 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 6b23a1c0a..f1fc304e2 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 5f318058f..b242ab247 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 5f5a572ac..7934c5b63 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 ecc7cd6d4..fcbe088df 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 8fa773959..2a16ad21e 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 9aecc6bd2..3729d81f6 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 1a23ac1ec..41c902be4 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 3b6e0f05b..cfec16ce6 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 c09fa7ea1..52b3e9429 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 e15c17c0e..c0846ded0 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 ef7feed6b..ae4153810 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 c08683bbd..326d3c697 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 db3a250b4..c2e2300f5 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 d44c046b9..968e02f72 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 c92890b5e..29102f6e6 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 6654b5c66..fa69f3339 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 ad2930a4e..d05cc7d9d 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 9e02ec76e..a56ac8a78 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 bf7b06401..a6125333b 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 d9862acd0..db5bdaab7 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 0748f2076..edba9747e 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 0ed2f5844..c7b66a474 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 9c9e6b669..2b776e304 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 b9ac21d32..20c4ff4a0 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 019ee71fa..61d0072d3 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 9da021e0f..3d2292a9f 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 526d682a9..877f5482a 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 6c4f860dc..ff7052c8a 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 f5eeb99dd..c51082e62 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 f1529da6e..16ae5c84a 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 2f928f4eb..d8b1017d9 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 87b433df7..cd888471b 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 99a48a206..302951e70 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 fbf213fde..3560f95a9 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 8bf4c5957..9fdff009a 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 a3957474d..04520213c 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 3ad09584c..d54bfc458 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 9fa712070..35d4e35d7 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 c0ac562e0..0edc1909b 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 2a33b060f..bf9d1d301 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 cf92573c8..564b2aaaa 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 7e48bb7d9..2fd2aeee2 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 ef41c3bf0..4373ddb56 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 5b63460c8..63aaa35db 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 f088950fe..a8c54656f 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 8bb317b47..03e2f9aa7 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 12778e148..1bebb6d42 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 0f0bc6d5d..32454a4cb 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 b7bba97c7..96d601e57 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 ad269e3cd..e66c80679 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 27e734f96..5a4188ecd 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 c6e3ec9f9..24642f5a2 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 9c8bab476..066edecd9 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 476b9bdf7..44d1e66ba 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 7c4185ad4..a7bdf3aa3 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 86e4bbcfb..74637500c 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 adeff7d81..393ddda93 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 e8daf6e85..cd6b30771 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 a39c352fb..1f7765194 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 24fb81198..7ed06316b 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 9da8eed57..53ed4cec3 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 f0fa5f40f..25b430342 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 2c54d57eb..e6083e5dc 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 f14d89f9f..417c3add2 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 652cd28a4..e5b75c74f 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 45a9e37d4..9cc393f20 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 1291da08e..3e5001bc7 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 ac81e3c7f..db52c5d4f 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 ed4534b6d..5a754d05d 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 7e7933bf0..005b81527 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 e772e07f4..29e07c6a6 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 f563c8be2..cf4be2471 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 dddb20fe8..8a184691b 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 d9fabab4e..0f3994fa6 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 228f0fe12..5a75ba3be 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 a9318cb5f..2d2a0dc7c 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 719e87785..fcf9dc62e 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 0dae8d56a..4e91f514d 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 7246cb500..0807912af 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 505b08736..3d9d048fd 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 f3d991fc0..776d1f92e 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 d82a0e8be..6db20f07e 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 9b3f1b9ee..d9c004492 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 7730d3e9b..19321a538 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 5bb8f3eb6..47618a4e1 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 59fba0327..eaae49e56 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 f33dd10f9..d60d07274 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 22f225e69..fe0346192 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 e5059ea43..a6ca5b94a 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 32e227cdc..677f2b661 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 186ea027c..4e59c6a6a 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 f1f7a8285..79dcb244f 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 8829aff70..41857385d 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 fdf05e0f5..f25d5b12b 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 7a8a2c65a..67225e6b9 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 42a1f0443..6420f6079 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 7a51b1321..885882be3 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 4436f2828..8f926a4ee 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 620631c6a..fefcb0057 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 da63024be..d0093777b 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 85269b827..21e359707 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 1c8cc5816..d2f248242 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 266c93b5f..d493f7a00 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 6f2664e11..7b75f7a73 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 985dc4f2a..18eaa2ef6 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 814f3878b..aaaa8b972 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 6e2411d81..f6bebe0e0 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 c09f44605..bb2278009 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 8418ddbf3..e6c67c0da 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 ba3fdc176..d129a94ca 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 780d21b28..1b524b09e 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 e1416538d..b6b3c9996 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 7f447d37f..6ffdee828 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 64c2107d0..6c617faad 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 53069f5ee..47f2ae927 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 2c94a0514..9f8c2a523 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 31bf0782d..6f2f20f40 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 2a93e3a7e..d8a2e9240 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 57c8ef3b9..7fbdde7b4 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 #----------------------------------------------------------#