diff --git a/bin/v_add_cron_job b/bin/v_add_cron_job index bb06fd462..6b228eeb6 100755 --- a/bin/v_add_cron_job +++ b/bin/v_add_cron_job @@ -22,7 +22,7 @@ job=$8 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_add_cron_report b/bin/v_add_cron_report index 926b7d95c..ed92a624a 100755 --- a/bin/v_add_cron_report +++ b/bin/v_add_cron_report @@ -15,7 +15,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_add_database b/bin/v_add_database index b45656abd..632156eb6 100755 --- a/bin/v_add_database +++ b/bin/v_add_database @@ -27,7 +27,7 @@ charset=$(echo "$charset" |tr '[:lower:]' '[:upper:]') # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/db.sh diff --git a/bin/v_add_database_server b/bin/v_add_database_server index 691e1393f..72c5b4c83 100755 --- a/bin/v_add_database_server +++ b/bin/v_add_database_server @@ -25,7 +25,7 @@ template=${8-template1} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/db.sh diff --git a/bin/v_add_dns_domain b/bin/v_add_dns_domain index 8859d44a8..3ba05d1f1 100755 --- a/bin/v_add_dns_domain +++ b/bin/v_add_dns_domain @@ -27,7 +27,7 @@ ttl=${7-14400} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_dns_domain_record b/bin/v_add_dns_domain_record index 5a9c7c277..335ce8678 100755 --- a/bin/v_add_dns_domain_record +++ b/bin/v_add_dns_domain_record @@ -27,7 +27,7 @@ priority=$7 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_mail_account b/bin/v_add_mail_account index f6c873aa6..e4e50ef0e 100755 --- a/bin/v_add_mail_account +++ b/bin/v_add_mail_account @@ -20,7 +20,7 @@ quota=${5-0} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_mail_account_alias b/bin/v_add_mail_account_alias index 0dbcec4d6..3b61379a8 100755 --- a/bin/v_add_mail_account_alias +++ b/bin/v_add_mail_account_alias @@ -19,7 +19,7 @@ malias=$4 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_mail_account_autoreply b/bin/v_add_mail_account_autoreply index 818057111..f26f60b7b 100755 --- a/bin/v_add_mail_account_autoreply +++ b/bin/v_add_mail_account_autoreply @@ -19,7 +19,7 @@ autoreply=$4 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_mail_account_forward b/bin/v_add_mail_account_forward index 4637c7a7a..c00e0c091 100755 --- a/bin/v_add_mail_account_forward +++ b/bin/v_add_mail_account_forward @@ -19,7 +19,7 @@ forward=$4 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_mail_domain b/bin/v_add_mail_domain index 2fa7cff42..a0919b3a1 100755 --- a/bin/v_add_mail_domain +++ b/bin/v_add_mail_domain @@ -21,7 +21,7 @@ dkim_size=${6-512} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_mail_domain_antispam b/bin/v_add_mail_domain_antispam index 00524dcf4..91fdef7a1 100755 --- a/bin/v_add_mail_domain_antispam +++ b/bin/v_add_mail_domain_antispam @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_mail_domain_antivirus b/bin/v_add_mail_domain_antivirus index 7a84614a2..e19155865 100755 --- a/bin/v_add_mail_domain_antivirus +++ b/bin/v_add_mail_domain_antivirus @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_mail_domain_cactchall b/bin/v_add_mail_domain_cactchall index b6e68fd95..ea5f42bec 100755 --- a/bin/v_add_mail_domain_cactchall +++ b/bin/v_add_mail_domain_cactchall @@ -18,7 +18,7 @@ email="$3" # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_mail_domain_dkim b/bin/v_add_mail_domain_dkim index d63a2bd9e..0616f5a4c 100755 --- a/bin/v_add_mail_domain_dkim +++ b/bin/v_add_mail_domain_dkim @@ -18,7 +18,7 @@ dkim_size=${3-512} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_sys_ip b/bin/v_add_sys_ip index d17d03164..2c327f2c0 100755 --- a/bin/v_add_sys_ip +++ b/bin/v_add_sys_ip @@ -24,7 +24,7 @@ ip_name=$6 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/ip.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_user b/bin/v_add_user index caf3d5cfb..15ef4f8ce 100755 --- a/bin/v_add_user +++ b/bin/v_add_user @@ -19,7 +19,7 @@ lname=$6 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh is_user_free() { check_sysuser=$(cut -f 1 -d : /etc/passwd | grep -w "$user" ) diff --git a/bin/v_add_user_backup b/bin/v_add_user_backup index 15b916c14..9a3889264 100755 --- a/bin/v_add_user_backup +++ b/bin/v_add_user_backup @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain index a43c61a88..a80391db4 100755 --- a/bin/v_add_web_domain +++ b/bin/v_add_web_domain @@ -24,7 +24,7 @@ template=${4-default} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/ip.sh diff --git a/bin/v_add_web_domain_alias b/bin/v_add_web_domain_alias index 8af02c30e..9bd5aafe3 100755 --- a/bin/v_add_web_domain_alias +++ b/bin/v_add_web_domain_alias @@ -21,7 +21,7 @@ dom_alias_idn=$(idn -t --quiet -a "$dom_alias" ) # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_web_domain_cgi b/bin/v_add_web_domain_cgi index 39821d8ab..559461cf7 100755 --- a/bin/v_add_web_domain_cgi +++ b/bin/v_add_web_domain_cgi @@ -19,7 +19,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_web_domain_elog b/bin/v_add_web_domain_elog index 95f4a9d34..bf7858a2b 100755 --- a/bin/v_add_web_domain_elog +++ b/bin/v_add_web_domain_elog @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_web_domain_nginx b/bin/v_add_web_domain_nginx index 86e71b86a..0f6a85545 100755 --- a/bin/v_add_web_domain_nginx +++ b/bin/v_add_web_domain_nginx @@ -21,7 +21,7 @@ extentions=${4-$default_extentions} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_web_domain_ssl b/bin/v_add_web_domain_ssl index d386b4db2..c1c3fe976 100755 --- a/bin/v_add_web_domain_ssl +++ b/bin/v_add_web_domain_ssl @@ -23,7 +23,7 @@ ssl_home=${4-single} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/ip.sh diff --git a/bin/v_add_web_domain_stats b/bin/v_add_web_domain_stats index 59d6f3ca7..695e34e2a 100755 --- a/bin/v_add_web_domain_stats +++ b/bin/v_add_web_domain_stats @@ -21,7 +21,7 @@ type=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_add_web_domain_stats_user b/bin/v_add_web_domain_stats_user index 1355c42ce..cc7c1f384 100755 --- a/bin/v_add_web_domain_stats_user +++ b/bin/v_add_web_domain_stats_user @@ -17,7 +17,7 @@ stats_pass=$4 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_backup_user b/bin/v_backup_user index d9e71e7b6..9b476bd75 100755 --- a/bin/v_backup_user +++ b/bin/v_backup_user @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/db.sh diff --git a/bin/v_backup_users b/bin/v_backup_users index e2919f4f3..9442e912b 100755 --- a/bin/v_backup_users +++ b/bin/v_backup_users @@ -15,7 +15,7 @@ source /etc/profile.d/vesta.sh # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_change_cron_job b/bin/v_change_cron_job index c7afcec8d..2183fefac 100755 --- a/bin/v_change_cron_job +++ b/bin/v_change_cron_job @@ -22,7 +22,7 @@ command=$8 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_change_database_password b/bin/v_change_database_password index 442789956..3dcdc74a9 100755 --- a/bin/v_change_database_password +++ b/bin/v_change_database_password @@ -17,7 +17,7 @@ dbpass=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/db.sh diff --git a/bin/v_change_dns_domain_exp b/bin/v_change_dns_domain_exp index e28275d02..35b5d4516 100755 --- a/bin/v_change_dns_domain_exp +++ b/bin/v_change_dns_domain_exp @@ -18,7 +18,7 @@ exp=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_change_dns_domain_ip b/bin/v_change_dns_domain_ip index 74b12e8e5..2b6f30dab 100755 --- a/bin/v_change_dns_domain_ip +++ b/bin/v_change_dns_domain_ip @@ -17,7 +17,7 @@ ip=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_change_dns_domain_record b/bin/v_change_dns_domain_record index 2bc44285a..649f827ea 100755 --- a/bin/v_change_dns_domain_record +++ b/bin/v_change_dns_domain_record @@ -24,7 +24,7 @@ priority=$7 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_change_dns_domain_soa b/bin/v_change_dns_domain_soa index 94cc1e15b..9de87867c 100755 --- a/bin/v_change_dns_domain_soa +++ b/bin/v_change_dns_domain_soa @@ -18,7 +18,7 @@ soa=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_change_dns_domain_tpl b/bin/v_change_dns_domain_tpl index a4c8f8b24..e57e2537a 100755 --- a/bin/v_change_dns_domain_tpl +++ b/bin/v_change_dns_domain_tpl @@ -19,7 +19,7 @@ template=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_change_dns_domain_ttl b/bin/v_change_dns_domain_ttl index be8a4b06e..c324a9c24 100755 --- a/bin/v_change_dns_domain_ttl +++ b/bin/v_change_dns_domain_ttl @@ -17,7 +17,7 @@ ttl=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_change_mail_account_password b/bin/v_change_mail_account_password index 73d70d26e..7b3caf05a 100755 --- a/bin/v_change_mail_account_password +++ b/bin/v_change_mail_account_password @@ -19,7 +19,7 @@ password=$4 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_change_mail_account_quota b/bin/v_change_mail_account_quota index 8594c2738..6ee123e5e 100755 --- a/bin/v_change_mail_account_quota +++ b/bin/v_change_mail_account_quota @@ -19,7 +19,7 @@ quota=$4 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_change_mail_domain_cactchall b/bin/v_change_mail_domain_cactchall index 35b9948bd..f1536e04d 100755 --- a/bin/v_change_mail_domain_cactchall +++ b/bin/v_change_mail_domain_cactchall @@ -18,7 +18,7 @@ email="$3" # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_change_sys_config_value b/bin/v_change_sys_config_value index fbad6db4d..e2fca61e6 100755 --- a/bin/v_change_sys_config_value +++ b/bin/v_change_sys_config_value @@ -16,7 +16,7 @@ value=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_change_sys_ip_name b/bin/v_change_sys_ip_name index 7fd728959..15138cd0a 100755 --- a/bin/v_change_sys_ip_name +++ b/bin/v_change_sys_ip_name @@ -15,7 +15,7 @@ ip_name=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/ip.sh diff --git a/bin/v_change_sys_ip_owner b/bin/v_change_sys_ip_owner index 741777464..9e122f737 100755 --- a/bin/v_change_sys_ip_owner +++ b/bin/v_change_sys_ip_owner @@ -14,7 +14,7 @@ ip=$1 user=$2 # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/ip.sh diff --git a/bin/v_change_sys_ip_status b/bin/v_change_sys_ip_status index 7af485a95..18da1602e 100755 --- a/bin/v_change_sys_ip_status +++ b/bin/v_change_sys_ip_status @@ -14,7 +14,7 @@ ip=$1 ip_status=$2 # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/ip.sh diff --git a/bin/v_change_user_contact b/bin/v_change_user_contact index 30c73bf8d..8dfa912a5 100755 --- a/bin/v_change_user_contact +++ b/bin/v_change_user_contact @@ -15,7 +15,7 @@ email=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_change_user_name b/bin/v_change_user_name index dfe1863e5..969702fac 100755 --- a/bin/v_change_user_name +++ b/bin/v_change_user_name @@ -16,7 +16,7 @@ lname=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_change_user_ns b/bin/v_change_user_ns index dd8e033fd..d8790435e 100755 --- a/bin/v_change_user_ns +++ b/bin/v_change_user_ns @@ -22,7 +22,7 @@ ns8=$9 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_change_user_package b/bin/v_change_user_package index a9161b272..b814b6206 100755 --- a/bin/v_change_user_package +++ b/bin/v_change_user_package @@ -15,7 +15,7 @@ package=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh is_package_avalable() { # Parsing user data diff --git a/bin/v_change_user_password b/bin/v_change_user_password index bce75182a..e13544a1f 100755 --- a/bin/v_change_user_password +++ b/bin/v_change_user_password @@ -15,7 +15,7 @@ password=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_change_user_shell b/bin/v_change_user_shell index b38b22e09..f4c0cf558 100755 --- a/bin/v_change_user_shell +++ b/bin/v_change_user_shell @@ -15,7 +15,7 @@ shell=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_change_web_domain_ip b/bin/v_change_web_domain_ip index d17df4656..a9d291e90 100755 --- a/bin/v_change_web_domain_ip +++ b/bin/v_change_web_domain_ip @@ -18,7 +18,7 @@ ip=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/ip.sh diff --git a/bin/v_change_web_domain_sslcert b/bin/v_change_web_domain_sslcert index accf4ea6b..c351d325e 100755 --- a/bin/v_change_web_domain_sslcert +++ b/bin/v_change_web_domain_sslcert @@ -18,7 +18,7 @@ ssl_dir=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_change_web_domain_sslhome b/bin/v_change_web_domain_sslhome index 6a0620545..e30aa4724 100755 --- a/bin/v_change_web_domain_sslhome +++ b/bin/v_change_web_domain_sslhome @@ -13,7 +13,7 @@ ssl_home=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_change_web_domain_tpl b/bin/v_change_web_domain_tpl index cccdd2a10..ae09532be 100755 --- a/bin/v_change_web_domain_tpl +++ b/bin/v_change_web_domain_tpl @@ -18,7 +18,7 @@ template=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_cron_job b/bin/v_delete_cron_job index 088f31e09..e975f3ffe 100755 --- a/bin/v_delete_cron_job +++ b/bin/v_delete_cron_job @@ -15,7 +15,7 @@ job=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_delete_cron_reports b/bin/v_delete_cron_reports index 313265b2f..a97fb7c19 100755 --- a/bin/v_delete_cron_reports +++ b/bin/v_delete_cron_reports @@ -15,7 +15,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_delete_database b/bin/v_delete_database index b94d63d42..645707a20 100755 --- a/bin/v_delete_database +++ b/bin/v_delete_database @@ -16,7 +16,7 @@ database=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/db.sh diff --git a/bin/v_delete_database_server b/bin/v_delete_database_server index 321be9718..b06826782 100755 --- a/bin/v_delete_database_server +++ b/bin/v_delete_database_server @@ -16,7 +16,7 @@ host=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/db.sh diff --git a/bin/v_delete_databases b/bin/v_delete_databases index 80eb2fa0a..374cc8843 100755 --- a/bin/v_delete_databases +++ b/bin/v_delete_databases @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_delete_dns_domain b/bin/v_delete_dns_domain index c7870d81f..886a590bd 100755 --- a/bin/v_delete_dns_domain +++ b/bin/v_delete_dns_domain @@ -17,7 +17,7 @@ restart="$3" # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_dns_domain_record b/bin/v_delete_dns_domain_record index 1187d8a65..9739e8883 100755 --- a/bin/v_delete_dns_domain_record +++ b/bin/v_delete_dns_domain_record @@ -17,7 +17,7 @@ id=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_dns_domains b/bin/v_delete_dns_domains index 80ce154c8..bac71fe71 100755 --- a/bin/v_delete_dns_domains +++ b/bin/v_delete_dns_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_delete_mail_account b/bin/v_delete_mail_account index f2efdee58..5b3d600ad 100755 --- a/bin/v_delete_mail_account +++ b/bin/v_delete_mail_account @@ -18,7 +18,7 @@ account=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_mail_account_alias b/bin/v_delete_mail_account_alias index 10a4ba4b9..c9c408cd8 100755 --- a/bin/v_delete_mail_account_alias +++ b/bin/v_delete_mail_account_alias @@ -19,7 +19,7 @@ malias=$4 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_mail_account_autoreply b/bin/v_delete_mail_account_autoreply index f5a5815a0..6e72dba3b 100755 --- a/bin/v_delete_mail_account_autoreply +++ b/bin/v_delete_mail_account_autoreply @@ -19,7 +19,7 @@ malias=$4 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_mail_account_forward b/bin/v_delete_mail_account_forward index ec3e3f7a1..a3cf5dca6 100755 --- a/bin/v_delete_mail_account_forward +++ b/bin/v_delete_mail_account_forward @@ -19,7 +19,7 @@ forward=$4 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_mail_domain b/bin/v_delete_mail_domain index a768e1a08..22fca2c7d 100755 --- a/bin/v_delete_mail_domain +++ b/bin/v_delete_mail_domain @@ -16,7 +16,7 @@ domain=$(idn -t --quiet -u "$2" ) # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_mail_domain_antispam b/bin/v_delete_mail_domain_antispam index de8e5acf3..504dd5947 100755 --- a/bin/v_delete_mail_domain_antispam +++ b/bin/v_delete_mail_domain_antispam @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_mail_domain_antivirus b/bin/v_delete_mail_domain_antivirus index 137e79c7d..2fe7ed959 100755 --- a/bin/v_delete_mail_domain_antivirus +++ b/bin/v_delete_mail_domain_antivirus @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_mail_domain_cactchall b/bin/v_delete_mail_domain_cactchall index b9b32b93f..82e010da0 100755 --- a/bin/v_delete_mail_domain_cactchall +++ b/bin/v_delete_mail_domain_cactchall @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_mail_domain_dkim b/bin/v_delete_mail_domain_dkim index 833fdec35..3c3afbf4c 100755 --- a/bin/v_delete_mail_domain_dkim +++ b/bin/v_delete_mail_domain_dkim @@ -16,7 +16,7 @@ domain=$(echo $domain | tr '[:upper:]' '[:lower:]') # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_sys_ip b/bin/v_delete_sys_ip index cc4e4ce75..54e5eca43 100755 --- a/bin/v_delete_sys_ip +++ b/bin/v_delete_sys_ip @@ -15,7 +15,7 @@ ip=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/ip.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_user b/bin/v_delete_user index 87d8133bb..7cc1edae1 100755 --- a/bin/v_delete_user +++ b/bin/v_delete_user @@ -15,7 +15,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/db.sh source $VESTA/func/ip.sh diff --git a/bin/v_delete_user_ips b/bin/v_delete_user_ips index e6dd34aa9..864694e06 100755 --- a/bin/v_delete_user_ips +++ b/bin/v_delete_user_ips @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/ip.sh diff --git a/bin/v_delete_web_domain b/bin/v_delete_web_domain index bf9e97062..c6c32fc12 100755 --- a/bin/v_delete_web_domain +++ b/bin/v_delete_web_domain @@ -20,7 +20,7 @@ restart=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/ip.sh diff --git a/bin/v_delete_web_domain_alias b/bin/v_delete_web_domain_alias index 1460cc820..14a68bb55 100755 --- a/bin/v_delete_web_domain_alias +++ b/bin/v_delete_web_domain_alias @@ -19,7 +19,7 @@ dom_alias_idn=$(idn -t --quiet -a "$dom_alias" ) # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_web_domain_cgi b/bin/v_delete_web_domain_cgi index d9175e8d6..aea0026bd 100755 --- a/bin/v_delete_web_domain_cgi +++ b/bin/v_delete_web_domain_cgi @@ -19,7 +19,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_web_domain_elog b/bin/v_delete_web_domain_elog index 69eef9d7e..013fd0e9a 100755 --- a/bin/v_delete_web_domain_elog +++ b/bin/v_delete_web_domain_elog @@ -18,7 +18,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_web_domain_nginx b/bin/v_delete_web_domain_nginx index 3e1b237cc..dd0e66423 100755 --- a/bin/v_delete_web_domain_nginx +++ b/bin/v_delete_web_domain_nginx @@ -16,7 +16,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_web_domain_ssl b/bin/v_delete_web_domain_ssl index 622efc005..0fb98a218 100755 --- a/bin/v_delete_web_domain_ssl +++ b/bin/v_delete_web_domain_ssl @@ -16,7 +16,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_web_domain_stats b/bin/v_delete_web_domain_stats index cf7b66e01..b035afbbb 100755 --- a/bin/v_delete_web_domain_stats +++ b/bin/v_delete_web_domain_stats @@ -16,7 +16,7 @@ domain=$(idn -t --quiet -u "$2" ) # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_web_domain_stats_user b/bin/v_delete_web_domain_stats_user index 8aa67f77b..a955fa918 100755 --- a/bin/v_delete_web_domain_stats_user +++ b/bin/v_delete_web_domain_stats_user @@ -18,7 +18,7 @@ domain=$(idn -t --quiet -u "$2" ) # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_delete_web_domains b/bin/v_delete_web_domains index 9400f8077..6ed969042 100755 --- a/bin/v_delete_web_domains +++ b/bin/v_delete_web_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_get_dns_domain_value b/bin/v_get_dns_domain_value index 90b0b4636..a69ae2696 100755 --- a/bin/v_get_dns_domain_value +++ b/bin/v_get_dns_domain_value @@ -16,7 +16,7 @@ domain_idn=$(idn -t --quiet -a "$domain") key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_get_user_value b/bin/v_get_user_value index 2756aa846..29224c917 100755 --- a/bin/v_get_user_value +++ b/bin/v_get_user_value @@ -15,7 +15,7 @@ key=$(echo "$2"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_get_web_domain_value b/bin/v_get_web_domain_value index dc6148e46..1d968261d 100755 --- a/bin/v_get_web_domain_value +++ b/bin/v_get_web_domain_value @@ -19,7 +19,7 @@ key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_list_cron_jobs b/bin/v_list_cron_jobs index e34fdcbba..990e9a744 100755 --- a/bin/v_list_cron_jobs +++ b/bin/v_list_cron_jobs @@ -14,7 +14,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json list function json_list_cron() { diff --git a/bin/v_list_database b/bin/v_list_database index 4dd6359ce..16cbbe907 100755 --- a/bin/v_list_database +++ b/bin/v_list_database @@ -15,7 +15,7 @@ database=$2 format=${3-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_db() { diff --git a/bin/v_list_database_server b/bin/v_list_database_server index a25c5b6dd..36776ddcc 100755 --- a/bin/v_list_database_server +++ b/bin/v_list_database_server @@ -15,7 +15,7 @@ host=$2 format=${3-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_dbhost() { diff --git a/bin/v_list_database_servers b/bin/v_list_database_servers index ba535e552..32b1d340e 100755 --- a/bin/v_list_database_servers +++ b/bin/v_list_database_servers @@ -14,7 +14,7 @@ type=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_databases b/bin/v_list_databases index 7656279fd..2e2c545ef 100755 --- a/bin/v_list_databases +++ b/bin/v_list_databases @@ -14,7 +14,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_dns_domain b/bin/v_list_dns_domain index 0a2a2763d..41ed20a40 100755 --- a/bin/v_list_dns_domain +++ b/bin/v_list_dns_domain @@ -16,7 +16,7 @@ domain=$2 format=${3-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_domain() { diff --git a/bin/v_list_dns_domain_records b/bin/v_list_dns_domain_records index c322fcc2f..6729c3e1b 100755 --- a/bin/v_list_dns_domain_records +++ b/bin/v_list_dns_domain_records @@ -15,7 +15,7 @@ domain=$2 format=${3-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json func json_list_dns() { diff --git a/bin/v_list_dns_domains b/bin/v_list_dns_domains index b28b2cf10..0ad1dd2f5 100755 --- a/bin/v_list_dns_domains +++ b/bin/v_list_dns_domains @@ -14,7 +14,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_dns_template b/bin/v_list_dns_template index c1c33cd5d..c6f4abe16 100755 --- a/bin/v_list_dns_template +++ b/bin/v_list_dns_template @@ -14,7 +14,7 @@ template=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh # Json func diff --git a/bin/v_list_dns_templates b/bin/v_list_dns_templates index f231d7b76..895614c7f 100755 --- a/bin/v_list_dns_templates +++ b/bin/v_list_dns_templates @@ -13,7 +13,7 @@ format=${1-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_dnstpl() { diff --git a/bin/v_list_mail_account b/bin/v_list_mail_account index 70b89859f..2d6632073 100755 --- a/bin/v_list_mail_account +++ b/bin/v_list_mail_account @@ -16,7 +16,7 @@ account=$3 format=${4-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_account() { diff --git a/bin/v_list_mail_account_autoreply b/bin/v_list_mail_account_autoreply index 89a21358e..afc18e5f1 100755 --- a/bin/v_list_mail_account_autoreply +++ b/bin/v_list_mail_account_autoreply @@ -16,7 +16,7 @@ account=$3 format=${4-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_msg() { diff --git a/bin/v_list_mail_accounts b/bin/v_list_mail_accounts index fdb6ca334..7100b70f3 100755 --- a/bin/v_list_mail_accounts +++ b/bin/v_list_mail_accounts @@ -15,7 +15,7 @@ domain=$2 format=${3-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_mail_domain b/bin/v_list_mail_domain index 227bbfced..8b40e8b17 100755 --- a/bin/v_list_mail_domain +++ b/bin/v_list_mail_domain @@ -16,7 +16,7 @@ domain=$2 format=${3-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_domain() { diff --git a/bin/v_list_mail_domain_dkim b/bin/v_list_mail_domain_dkim index 55f459fe6..3985c2c39 100755 --- a/bin/v_list_mail_domain_dkim +++ b/bin/v_list_mail_domain_dkim @@ -15,7 +15,7 @@ domain=$2 format=${3-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_ssl() { diff --git a/bin/v_list_mail_domains b/bin/v_list_mail_domains index 2a3fd903e..87a74515c 100755 --- a/bin/v_list_mail_domains +++ b/bin/v_list_mail_domains @@ -14,7 +14,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_sys_interfaces b/bin/v_list_sys_interfaces index 84e11d373..7d6baf7f3 100755 --- a/bin/v_list_sys_interfaces +++ b/bin/v_list_sys_interfaces @@ -13,7 +13,7 @@ format=${1-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_iface() { diff --git a/bin/v_list_sys_ip b/bin/v_list_sys_ip index 0a20a188c..24401cefa 100755 --- a/bin/v_list_sys_ip +++ b/bin/v_list_sys_ip @@ -15,7 +15,7 @@ IP=$ip format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/ip.sh # Json function diff --git a/bin/v_list_sys_ips b/bin/v_list_sys_ips index 4a4340446..c23fe8874 100755 --- a/bin/v_list_sys_ips +++ b/bin/v_list_sys_ips @@ -13,7 +13,7 @@ format=${1-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_ips() { diff --git a/bin/v_list_sys_shells b/bin/v_list_sys_shells index 3fdb89658..587019bc1 100755 --- a/bin/v_list_sys_shells +++ b/bin/v_list_sys_shells @@ -13,7 +13,7 @@ format=${1-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_sh() { diff --git a/bin/v_list_user b/bin/v_list_user index 646cf7d17..c808d6a83 100755 --- a/bin/v_list_user +++ b/bin/v_list_user @@ -10,7 +10,7 @@ #----------------------------------------------------------# # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Argument defenition user=$1 diff --git a/bin/v_list_user_backups b/bin/v_list_user_backups index 47ed5f394..5fc61819b 100755 --- a/bin/v_list_user_backups +++ b/bin/v_list_user_backups @@ -14,7 +14,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# # Verifications # diff --git a/bin/v_list_user_ips b/bin/v_list_user_ips index fec9fdad8..796350876 100755 --- a/bin/v_list_user_ips +++ b/bin/v_list_user_ips @@ -14,7 +14,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_user_ips() { diff --git a/bin/v_list_user_ns b/bin/v_list_user_ns index a7c3ee1c6..21c5bcd6e 100755 --- a/bin/v_list_user_ns +++ b/bin/v_list_user_ns @@ -14,7 +14,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_ns() { diff --git a/bin/v_list_user_packages b/bin/v_list_user_packages index efd6d1246..3c6e7201a 100755 --- a/bin/v_list_user_packages +++ b/bin/v_list_user_packages @@ -13,7 +13,7 @@ format=${1-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_pkgs() { diff --git a/bin/v_list_web_domain b/bin/v_list_web_domain index 018f9b81b..f8bb6c294 100755 --- a/bin/v_list_web_domain +++ b/bin/v_list_web_domain @@ -16,7 +16,7 @@ domain=$2 format=${3-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_domain() { diff --git a/bin/v_list_web_domain_ssl b/bin/v_list_web_domain_ssl index 4dd630fbe..2b17707e7 100755 --- a/bin/v_list_web_domain_ssl +++ b/bin/v_list_web_domain_ssl @@ -15,7 +15,7 @@ domain=$2 format=${3-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_ssl() { diff --git a/bin/v_list_web_domains b/bin/v_list_web_domains index ffacfdb99..c9783b713 100755 --- a/bin/v_list_web_domains +++ b/bin/v_list_web_domains @@ -14,7 +14,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_alias b/bin/v_list_web_domains_alias index 8c1dafd29..36e9cc8c3 100755 --- a/bin/v_list_web_domains_alias +++ b/bin/v_list_web_domains_alias @@ -16,7 +16,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_elog b/bin/v_list_web_domains_elog index 83ae5e09b..0d6ca6a9f 100755 --- a/bin/v_list_web_domains_elog +++ b/bin/v_list_web_domains_elog @@ -16,7 +16,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_nginx b/bin/v_list_web_domains_nginx index fac20e361..2f8941516 100755 --- a/bin/v_list_web_domains_nginx +++ b/bin/v_list_web_domains_nginx @@ -16,7 +16,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_ssl b/bin/v_list_web_domains_ssl index 720680034..4a34de7cb 100755 --- a/bin/v_list_web_domains_ssl +++ b/bin/v_list_web_domains_ssl @@ -16,7 +16,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_stats b/bin/v_list_web_domains_stats index 219fd772a..5519f2df1 100755 --- a/bin/v_list_web_domains_stats +++ b/bin/v_list_web_domains_stats @@ -17,7 +17,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_list_web_templates b/bin/v_list_web_templates index fd126f7d1..4e199fb0f 100755 --- a/bin/v_list_web_templates +++ b/bin/v_list_web_templates @@ -14,7 +14,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_wtpl() { diff --git a/bin/v_list_web_templates_nginx b/bin/v_list_web_templates_nginx index 09d27e946..b9389de33 100755 --- a/bin/v_list_web_templates_nginx +++ b/bin/v_list_web_templates_nginx @@ -14,7 +14,7 @@ user=$1 format=${2-shell} # Includes -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Json function json_list_wtpl() { diff --git a/bin/v_rebuild_cron_jobs b/bin/v_rebuild_cron_jobs index e825cd1cb..3b3ce6add 100755 --- a/bin/v_rebuild_cron_jobs +++ b/bin/v_rebuild_cron_jobs @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_rebuild_databases b/bin/v_rebuild_databases index 22dbe1973..2052fa5c4 100755 --- a/bin/v_rebuild_databases +++ b/bin/v_rebuild_databases @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/db.sh diff --git a/bin/v_rebuild_dns_domains b/bin/v_rebuild_dns_domains index d30992190..d5e314f24 100755 --- a/bin/v_rebuild_dns_domains +++ b/bin/v_rebuild_dns_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_rebuild_mail_domains b/bin/v_rebuild_mail_domains index e943ccf35..dfe3d75e0 100755 --- a/bin/v_rebuild_mail_domains +++ b/bin/v_rebuild_mail_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_rebuild_user b/bin/v_rebuild_user index bfdc5f916..50b653c14 100755 --- a/bin/v_rebuild_user +++ b/bin/v_rebuild_user @@ -15,7 +15,7 @@ full=${2-no} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_rebuild_web_domains b/bin/v_rebuild_web_domains index 2c012a59d..ab2da5afa 100755 --- a/bin/v_rebuild_web_domains +++ b/bin/v_rebuild_web_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/ip.sh diff --git a/bin/v_restart_cron b/bin/v_restart_cron index 9e3de9fb8..3499a3f2a 100755 --- a/bin/v_restart_cron +++ b/bin/v_restart_cron @@ -11,7 +11,7 @@ # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh EVENT=${1-$EVENT} diff --git a/bin/v_restart_dns b/bin/v_restart_dns index 2f34074b2..b99373732 100755 --- a/bin/v_restart_dns +++ b/bin/v_restart_dns @@ -11,7 +11,7 @@ # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh EVENT=${1-$EVENT} #----------------------------------------------------------# diff --git a/bin/v_restart_mail b/bin/v_restart_mail index 140573d15..6c3021791 100755 --- a/bin/v_restart_mail +++ b/bin/v_restart_mail @@ -11,7 +11,7 @@ # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh EVENT=${1-$EVENT} #----------------------------------------------------------# diff --git a/bin/v_restart_web b/bin/v_restart_web index ad90ae129..64d00d71d 100755 --- a/bin/v_restart_web +++ b/bin/v_restart_web @@ -11,7 +11,7 @@ # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh EVENT=${1-$EVENT} #----------------------------------------------------------# diff --git a/bin/v_restore_user b/bin/v_restore_user index d2234732f..235689724 100755 --- a/bin/v_restore_user +++ b/bin/v_restore_user @@ -15,7 +15,7 @@ backup=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/func/db.sh diff --git a/bin/v_suspend_cron_job b/bin/v_suspend_cron_job index 77fea374b..ca56a3bf6 100755 --- a/bin/v_suspend_cron_job +++ b/bin/v_suspend_cron_job @@ -16,7 +16,7 @@ restart=$3 # Inlcudes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_suspend_cron_jobs b/bin/v_suspend_cron_jobs index df0a3c1eb..33708edef 100755 --- a/bin/v_suspend_cron_jobs +++ b/bin/v_suspend_cron_jobs @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_suspend_database b/bin/v_suspend_database index 62bb95e86..84b943db9 100755 --- a/bin/v_suspend_database +++ b/bin/v_suspend_database @@ -15,7 +15,7 @@ database=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/db.sh diff --git a/bin/v_suspend_database_server b/bin/v_suspend_database_server index edba4d9f7..2854dae62 100755 --- a/bin/v_suspend_database_server +++ b/bin/v_suspend_database_server @@ -15,7 +15,7 @@ host=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_suspend_databases b/bin/v_suspend_databases index 1eac8e4a3..44582c5e1 100755 --- a/bin/v_suspend_databases +++ b/bin/v_suspend_databases @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_suspend_dns_domain b/bin/v_suspend_dns_domain index 233a65200..848bd3ae0 100755 --- a/bin/v_suspend_dns_domain +++ b/bin/v_suspend_dns_domain @@ -17,7 +17,7 @@ restart="$3" # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_suspend_dns_domains b/bin/v_suspend_dns_domains index f4f82ba11..ca84f1b5e 100755 --- a/bin/v_suspend_dns_domains +++ b/bin/v_suspend_dns_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_suspend_mail_account b/bin/v_suspend_mail_account index 0a69e9c35..767449085 100755 --- a/bin/v_suspend_mail_account +++ b/bin/v_suspend_mail_account @@ -18,7 +18,7 @@ account=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_suspend_mail_accounts b/bin/v_suspend_mail_accounts index 3759c0c02..7b81aad0e 100755 --- a/bin/v_suspend_mail_accounts +++ b/bin/v_suspend_mail_accounts @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_suspend_mail_domain b/bin/v_suspend_mail_domain index 0ab1224e6..9678e9712 100755 --- a/bin/v_suspend_mail_domain +++ b/bin/v_suspend_mail_domain @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_suspend_mail_domains b/bin/v_suspend_mail_domains index fa01838bc..1caaaa778 100755 --- a/bin/v_suspend_mail_domains +++ b/bin/v_suspend_mail_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_suspend_user b/bin/v_suspend_user index edadc848d..115049af8 100755 --- a/bin/v_suspend_user +++ b/bin/v_suspend_user @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_suspend_web_domain b/bin/v_suspend_web_domain index 3a39a008c..035f4a89d 100755 --- a/bin/v_suspend_web_domain +++ b/bin/v_suspend_web_domain @@ -18,7 +18,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh url="${3-$SUSPEND_URL}" diff --git a/bin/v_suspend_web_domains b/bin/v_suspend_web_domains index 5259bd6a8..dbbe163dc 100755 --- a/bin/v_suspend_web_domains +++ b/bin/v_suspend_web_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh # Defining url diff --git a/bin/v_unsuspend_cron_job b/bin/v_unsuspend_cron_job index 49d1b5579..0ca9ab9e6 100755 --- a/bin/v_unsuspend_cron_job +++ b/bin/v_unsuspend_cron_job @@ -16,7 +16,7 @@ restart="${3-yes}" # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_unsuspend_cron_jobs b/bin/v_unsuspend_cron_jobs index 40e2125b8..c37a762b2 100755 --- a/bin/v_unsuspend_cron_jobs +++ b/bin/v_unsuspend_cron_jobs @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_unsuspend_database b/bin/v_unsuspend_database index 15e28bf0f..d700dd0a9 100755 --- a/bin/v_unsuspend_database +++ b/bin/v_unsuspend_database @@ -15,7 +15,7 @@ database=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/db.sh diff --git a/bin/v_unsuspend_database_server b/bin/v_unsuspend_database_server index d8195c875..387e1cf16 100755 --- a/bin/v_unsuspend_database_server +++ b/bin/v_unsuspend_database_server @@ -15,7 +15,7 @@ host=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_unsuspend_databases b/bin/v_unsuspend_databases index 0809e32be..8483110eb 100755 --- a/bin/v_unsuspend_databases +++ b/bin/v_unsuspend_databases @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/db.sh diff --git a/bin/v_unsuspend_dns_domain b/bin/v_unsuspend_dns_domain index c8f060d72..5b9bf69c4 100755 --- a/bin/v_unsuspend_dns_domain +++ b/bin/v_unsuspend_dns_domain @@ -17,7 +17,7 @@ restart="$3" # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_unsuspend_dns_domains b/bin/v_unsuspend_dns_domains index a09807470..58f9c2269 100755 --- a/bin/v_unsuspend_dns_domains +++ b/bin/v_unsuspend_dns_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_unsuspend_mail_account b/bin/v_unsuspend_mail_account index b17bc2fc9..15a1c9298 100755 --- a/bin/v_unsuspend_mail_account +++ b/bin/v_unsuspend_mail_account @@ -18,7 +18,7 @@ account=$3 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_unsuspend_mail_accounts b/bin/v_unsuspend_mail_accounts index 16c95e030..51c53a202 100755 --- a/bin/v_unsuspend_mail_accounts +++ b/bin/v_unsuspend_mail_accounts @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_unsuspend_mail_domain b/bin/v_unsuspend_mail_domain index 4d0f7a1c2..383bfe700 100755 --- a/bin/v_unsuspend_mail_domain +++ b/bin/v_unsuspend_mail_domain @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_unsuspend_mail_domains b/bin/v_unsuspend_mail_domains index fcd8e3ea2..d03c87431 100755 --- a/bin/v_unsuspend_mail_domains +++ b/bin/v_unsuspend_mail_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_unsuspend_user b/bin/v_unsuspend_user index 2b6bb4bfa..18e0e09ae 100755 --- a/bin/v_unsuspend_user +++ b/bin/v_unsuspend_user @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_unsuspend_web_domain b/bin/v_unsuspend_web_domain index 4c666d238..c77c58db8 100755 --- a/bin/v_unsuspend_web_domain +++ b/bin/v_unsuspend_web_domain @@ -17,7 +17,7 @@ restart="$3" # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_unsuspend_web_domains b/bin/v_unsuspend_web_domains index bac6f7523..e7a9bc3d5 100755 --- a/bin/v_unsuspend_web_domains +++ b/bin/v_unsuspend_web_domains @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_update_database_disk b/bin/v_update_database_disk index 43ecd50ff..528a031c9 100755 --- a/bin/v_update_database_disk +++ b/bin/v_update_database_disk @@ -15,7 +15,7 @@ database=$2 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/db.sh diff --git a/bin/v_update_databases_disk b/bin/v_update_databases_disk index 1252d6ab1..c152688af 100755 --- a/bin/v_update_databases_disk +++ b/bin/v_update_databases_disk @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_mail_domain_disk b/bin/v_update_mail_domain_disk index a475c70bb..8a001e203 100755 --- a/bin/v_update_mail_domain_disk +++ b/bin/v_update_mail_domain_disk @@ -17,7 +17,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_mail_domains_disk b/bin/v_update_mail_domains_disk index 824d66ca0..8533f8031 100755 --- a/bin/v_update_mail_domains_disk +++ b/bin/v_update_mail_domains_disk @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_sys_ip b/bin/v_update_sys_ip index 81958e50d..c757fc253 100755 --- a/bin/v_update_sys_ip +++ b/bin/v_update_sys_ip @@ -17,7 +17,7 @@ ip_status=${2-shared} # Includes source $VESTA/conf/vesta.conf # include for internal func -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/ip.sh source $VESTA/func/domain.sh diff --git a/bin/v_update_sys_queue b/bin/v_update_sys_queue index 9b877ee31..688fb5dd6 100755 --- a/bin/v_update_sys_queue +++ b/bin/v_update_sys_queue @@ -21,7 +21,7 @@ source /etc/profile.d/vesta.sh # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Export PATH for cron PATH=$PATH:$BIN diff --git a/bin/v_update_sys_rrd b/bin/v_update_sys_rrd index 56dcc51e8..7c8c85a60 100755 --- a/bin/v_update_sys_rrd +++ b/bin/v_update_sys_rrd @@ -16,7 +16,7 @@ source /etc/profile.d/vesta.sh # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Another workaround for cron enviroment PATH="$PATH:$BIN" diff --git a/bin/v_update_sys_rrd_ftp b/bin/v_update_sys_rrd_ftp index aa48c68ef..e79623bcf 100755 --- a/bin/v_update_sys_rrd_ftp +++ b/bin/v_update_sys_rrd_ftp @@ -14,7 +14,7 @@ period=${1-daily} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_sys_rrd_httpd b/bin/v_update_sys_rrd_httpd index 1080aabc5..297d1028a 100755 --- a/bin/v_update_sys_rrd_httpd +++ b/bin/v_update_sys_rrd_httpd @@ -14,7 +14,7 @@ period=${1-daily} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_sys_rrd_la b/bin/v_update_sys_rrd_la index 34733f7c1..2b2f5c027 100755 --- a/bin/v_update_sys_rrd_la +++ b/bin/v_update_sys_rrd_la @@ -14,7 +14,7 @@ period=${1-daily} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_sys_rrd_mem b/bin/v_update_sys_rrd_mem index a4c179871..639db83b5 100755 --- a/bin/v_update_sys_rrd_mem +++ b/bin/v_update_sys_rrd_mem @@ -14,7 +14,7 @@ period=${1-daily} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_sys_rrd_mysql b/bin/v_update_sys_rrd_mysql index 5348d72a3..95baf5eee 100755 --- a/bin/v_update_sys_rrd_mysql +++ b/bin/v_update_sys_rrd_mysql @@ -14,7 +14,7 @@ period=${1-daily} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_sys_rrd_net b/bin/v_update_sys_rrd_net index 8e56996fb..b66397846 100755 --- a/bin/v_update_sys_rrd_net +++ b/bin/v_update_sys_rrd_net @@ -14,7 +14,7 @@ period=${1-daily} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_sys_rrd_nginx b/bin/v_update_sys_rrd_nginx index d21390488..6acd6433e 100755 --- a/bin/v_update_sys_rrd_nginx +++ b/bin/v_update_sys_rrd_nginx @@ -14,7 +14,7 @@ period=${1-daily} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_sys_rrd_pgsql b/bin/v_update_sys_rrd_pgsql index 09e8ee0fc..5a4e9f38b 100755 --- a/bin/v_update_sys_rrd_pgsql +++ b/bin/v_update_sys_rrd_pgsql @@ -14,7 +14,7 @@ period=${1-daily} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_sys_rrd_ssh b/bin/v_update_sys_rrd_ssh index 18bd203d9..5fcb7e273 100755 --- a/bin/v_update_sys_rrd_ssh +++ b/bin/v_update_sys_rrd_ssh @@ -14,7 +14,7 @@ period=${1-daily} # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_sys_vesta b/bin/v_update_sys_vesta index 829bed4d8..336a1a120 100755 --- a/bin/v_update_sys_vesta +++ b/bin/v_update_sys_vesta @@ -19,7 +19,7 @@ source /etc/profile.d/vesta.sh # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_user_backups b/bin/v_update_user_backups index e1642c0fa..628ea3c06 100755 --- a/bin/v_update_user_backups +++ b/bin/v_update_user_backups @@ -11,7 +11,7 @@ # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh # Argument defenition user=$1 diff --git a/bin/v_update_user_counters b/bin/v_update_user_counters index e7c761850..8a42f59e6 100755 --- a/bin/v_update_user_counters +++ b/bin/v_update_user_counters @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_user_disk b/bin/v_update_user_disk index aa5fd4c66..19d4812b5 100755 --- a/bin/v_update_user_disk +++ b/bin/v_update_user_disk @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_user_stats b/bin/v_update_user_stats index 1ecf27387..438430d43 100755 --- a/bin/v_update_user_stats +++ b/bin/v_update_user_stats @@ -18,7 +18,7 @@ source /etc/profile.d/vesta.sh # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_update_web_domain_disk b/bin/v_update_web_domain_disk index c939d648f..5e838a062 100755 --- a/bin/v_update_web_domain_disk +++ b/bin/v_update_web_domain_disk @@ -16,7 +16,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_update_web_domain_stat b/bin/v_update_web_domain_stat index c79aeb5e1..3d82b0030 100755 --- a/bin/v_update_web_domain_stat +++ b/bin/v_update_web_domain_stat @@ -16,7 +16,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_update_web_domain_traff b/bin/v_update_web_domain_traff index f6627128a..e0be5b0d1 100755 --- a/bin/v_update_web_domain_traff +++ b/bin/v_update_web_domain_traff @@ -16,7 +16,7 @@ domain_idn=$(idn -t --quiet -a "$domain") # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_update_web_domains_disk b/bin/v_update_web_domains_disk index 203a952ac..b30fdc791 100755 --- a/bin/v_update_web_domains_disk +++ b/bin/v_update_web_domains_disk @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh #----------------------------------------------------------# diff --git a/bin/v_update_web_domains_stat b/bin/v_update_web_domains_stat index 61a8880fd..b0eba1e64 100755 --- a/bin/v_update_web_domains_stat +++ b/bin/v_update_web_domains_stat @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/bin/v_update_web_domains_traff b/bin/v_update_web_domains_traff index 8d5af336c..2be64bcf4 100755 --- a/bin/v_update_web_domains_traff +++ b/bin/v_update_web_domains_traff @@ -14,7 +14,7 @@ user=$1 # Includes source $VESTA/conf/vesta.conf -source $VESTA/func/shared.sh +source $VESTA/func/main.sh source $VESTA/func/domain.sh diff --git a/func/shared.sh b/func/main.sh similarity index 100% rename from func/shared.sh rename to func/main.sh