diff --git a/bin/v_add_cron_job b/bin/v_add_cron_job index bb06fd46..6b228eeb 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 926b7d95..ed92a624 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 b45656ab..632156eb 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 691e1393..72c5b4c8 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 8859d44a..3ba05d1f 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 5a9c7c27..335ce867 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 f6c873aa..e4e50ef0 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 0dbcec4d..3b61379a 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 81805711..f26f60b7 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 4637c7a7..c00e0c09 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 2fa7cff4..a0919b3a 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 00524dcf..91fdef7a 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 7a84614a..e1915586 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 b6e68fd9..ea5f42be 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 d63a2bd9..0616f5a4 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 d17d0316..2c327f2c 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 caf3d5cf..15ef4f8c 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 15b916c1..9a388926 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 a43c61a8..a80391db 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 8af02c30..9bd5aafe 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 39821d8a..559461cf 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 95f4a9d3..bf7858a2 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 86e71b86..0f6a8554 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 d386b4db..c1c3fe97 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 59d6f3ca..695e34e2 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 1355c42c..cc7c1f38 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 d9e71e7b..9b476bd7 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 e2919f4f..9442e912 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 c7afcec8..2183fefa 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 44278995..3dcdc74a 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 e28275d0..35b5d451 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 74b12e8e..2b6f30da 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 2bc44285..649f827e 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 94cc1e15..9de87867 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 a4c8f8b2..e57e2537 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 be8a4b06..c324a9c2 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 73d70d26..7b3caf05 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 8594c273..6ee123e5 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 35b9948b..f1536e04 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 fbad6db4..e2fca61e 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 7fd72895..15138cd0 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 74177746..9e122f73 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 7af485a9..18da1602 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 30c73bf8..8dfa912a 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 dfe1863e..969702fa 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 dd8e033f..d8790435 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 a9161b27..b814b620 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 bce75182..e13544a1 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 b38b22e0..f4c0cf55 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 d17df465..a9d291e9 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 accf4ea6..c351d325 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 6a062054..e30aa472 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 cccdd2a1..ae09532b 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 088f31e0..e975f3ff 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 313265b2..a97fb7c1 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 b94d63d4..645707a2 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 321be971..b0682678 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 80eb2fa0..374cc884 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 c7870d81..886a590b 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 1187d8a6..9739e888 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 80ce154c..bac71fe7 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 f2efdee5..5b3d600a 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 10a4ba4b..c9c408cd 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 f5a5815a..6e72dba3 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 ec3e3f7a..a3cf5dca 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 a768e1a0..22fca2c7 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 de8e5acf..504dd594 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 137e79c7..2fe7ed95 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 b9b32b93..82e010da 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 833fdec3..3c3afbf4 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 cc4e4ce7..54e5eca4 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 87d8133b..7cc1edae 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 e6dd34aa..864694e0 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 bf9e9706..c6c32fc1 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 1460cc82..14a68bb5 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 d9175e8d..aea0026b 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 69eef9d7..013fd0e9 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 3e1b237c..dd0e6642 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 622efc00..0fb98a21 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 cf7b66e0..b035afbb 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 8aa67f77..a955fa91 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 9400f807..6ed96904 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 90b0b463..a69ae269 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 2756aa84..29224c91 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 dc6148e4..1d968261 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 e34fdcbb..990e9a74 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 4dd6359c..16cbbe90 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 a25c5b6d..36776ddc 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 ba535e55..32b1d340 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 7656279f..2e2c545e 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 0a2a2763..41ed20a4 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 c322fcc2..6729c3e1 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 b28b2cf1..0ad1dd2f 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 c1c33cd5..c6f4abe1 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 f231d7b7..895614c7 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 70b89859..2d663207 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 89a21358..afc18e5f 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 fdb6ca33..7100b70f 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 227bbfce..8b40e8b1 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 55f459fe..3985c2c3 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 2a3fd903..87a74515 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 84e11d37..7d6baf7f 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 0a20a188..24401cef 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 4a434044..c23fe887 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 3fdb8965..587019bc 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 646cf7d1..c808d6a8 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 47ed5f39..5fc61819 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 fec9fdad..79635087 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 a7c3ee1c..21c5bcd6 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 efd6d124..3c6e7201 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 018f9b81..f8bb6c29 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 4dd630fb..2b17707e 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 ffacfdb9..c9783b71 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 8c1dafd2..36e9cc8c 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 83ae5e09..0d6ca6a9 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 fac20e36..2f894151 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 72068003..4a34de7c 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 219fd772..5519f2df 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 fd126f7d..4e199fb0 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 09d27e94..b9389de3 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 e825cd1c..3b3ce6ad 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 22dbe197..2052fa5c 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 d3099219..d5e314f2 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 e943ccf3..dfe3d75e 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 bfdc5f91..50b653c1 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 2c012a59..ab2da5af 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 9e3de9fb..3499a3f2 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 2f34074b..b9937373 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 140573d1..6c302179 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 ad90ae12..64d00d71 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 d2234732..23568972 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 77fea374..ca56a3bf 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 df0a3c1e..33708ede 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 62bb95e8..84b943db 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 edba4d9f..2854dae6 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 1eac8e4a..44582c5e 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 233a6520..848bd3ae 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 f4f82ba1..ca84f1b5 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 0a69e9c3..76744908 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 3759c0c0..7b81aad0 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 0ab1224e..9678e971 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 fa01838b..1caaaa77 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 edadc848..115049af 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 3a39a008..035f4a89 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 5259bd6a..dbbe163d 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 49d1b557..0ca9ab9e 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 40e2125b..c37a762b 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 15e28bf0..d700dd0a 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 d8195c87..387e1cf1 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 0809e32b..8483110e 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 c8f060d7..5b9bf69c 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 a0980747..58f9c226 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 b17bc2fc..15a1c929 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 16c95e03..51c53a20 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 4d0f7a1c..383bfe70 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 fcd8e3ea..d03c8743 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 2b6bb4bf..18e0e09a 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 4c666d23..c77c58db 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 bac6f752..e7a9bc3d 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 43ecd50f..528a031c 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 1252d6ab..c152688a 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 a475c70b..8a001e20 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 824d66ca..8533f803 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 81958e50..c757fc25 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 9b877ee3..688fb5dd 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 56dcc51e..7c8c85a6 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 aa48c68e..e79623bc 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 1080aabc..297d1028 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 34733f7c..2b2f5c02 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 a4c17987..639db83b 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 5348d72a..95baf5ee 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 8e56996f..b6639784 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 d2139048..6acd6433 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 09e8ee0f..5a4e9f38 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 18bd203d..5fcb7e27 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 829bed4d..336a1a12 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 e1642c0f..628ea3c0 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 e7c76185..8a42f59e 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 aa5fd4c6..19d4812b 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 1ecf2738..438430d4 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 c939d648..5e838a06 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 c79aeb5e..3d82b003 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 f6627128..e0be5b0d 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 203a952a..b30fdc79 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 61a8880f..b0eba1e6 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 8d5af336..2be64bcf 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