renamed internal functions

bin/v_add_db_base

@@ -16,8 +16,8 @@ encoding=${7-UTF8}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/db.func
 
 
 #----------------------------------------------------------#

bin/v_add_db_host

@@ -18,8 +18,8 @@ template=${8-template1}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/db.func
 
 
 #----------------------------------------------------------#

bin/v_add_dns_domain

@@ -18,8 +18,8 @@ ttl=${7-14400}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_add_dns_domain_record

@@ -16,8 +16,8 @@ id=$6
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_add_ssl_certificate

@@ -11,8 +11,8 @@ cert=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/cert_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/cert.func
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v_add_sys_cron

@@ -17,8 +17,8 @@ job=$8
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/cron_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/cron.func
 
 
 #----------------------------------------------------------#

bin/v_add_sys_ip

@@ -15,9 +15,9 @@ ip_name=$6
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/ip_func.sh
-source $V_FUNC/domain_func.sh    # for namehosting
+source $V_FUNC/shared.func
+source $V_FUNC/ip.func
+source $V_FUNC/domain.func    # for namehosting
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v_add_sys_user

@@ -15,7 +15,7 @@ lname=$6
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_add_sys_user_reports

@@ -10,8 +10,8 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/cron_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/cron.func
 
 
 #----------------------------------------------------------#

bin/v_add_web_domain

@@ -14,9 +14,9 @@ template=${4-default}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
+source $V_FUNC/ip.func
 
 
 #----------------------------------------------------------#

bin/v_add_web_domain_alias

@@ -14,8 +14,8 @@ dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_add_web_domain_cgi

@@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_add_web_domain_elog

@@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_add_web_domain_nginx

@@ -16,8 +16,8 @@ extentions=${4-$default_extentions}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_add_web_domain_ssl

@@ -14,9 +14,9 @@ tpl_option=${4-single}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
+source $V_FUNC/ip.func
 
 
 #----------------------------------------------------------#

bin/v_add_web_domain_stat

@@ -13,8 +13,8 @@ type=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_add_web_domain_stat_auth

@@ -13,8 +13,8 @@ auth_pass=$4
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_backup_sys_user

@@ -11,9 +11,9 @@ output=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
+source $V_FUNC/db.func
 source $V_CONF/vesta.conf
 
 

bin/v_backup_sys_users

@@ -12,7 +12,7 @@ source /etc/profile.d/vesta.sh
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_change_db_password

@@ -12,8 +12,8 @@ db_password=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/db.func
 
 
 #----------------------------------------------------------#

bin/v_change_dns_domain_exp

@@ -13,8 +13,8 @@ exp=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_change_dns_domain_ip

@@ -13,8 +13,8 @@ ip=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v_change_dns_domain_record

@@ -16,8 +16,8 @@ value=$(idn -t --quiet -u "$6" )
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_change_dns_domain_soa

@@ -13,8 +13,8 @@ soa=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v_change_dns_domain_tpl

@@ -13,8 +13,8 @@ template=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_change_dns_domain_ttl

@@ -13,8 +13,8 @@ ttl=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_change_sys_cron_job

@@ -17,8 +17,8 @@ command=$8
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/cron_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/cron.func
 
 
 #----------------------------------------------------------#

bin/v_change_sys_ip_name

@@ -11,8 +11,8 @@ ip_name=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/ip.func
 
 
 #----------------------------------------------------------#

bin/v_change_sys_ip_owner

@@ -11,8 +11,8 @@ ip=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/ip.func
 
 
 #----------------------------------------------------------#

bin/v_change_sys_ip_status

@@ -11,8 +11,8 @@ ip_status=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/ip.func
 
 
 #----------------------------------------------------------#

bin/v_change_sys_user_contact

@@ -11,7 +11,7 @@ email=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v_change_sys_user_name

@@ -12,7 +12,7 @@ lname=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_change_sys_user_ns

@@ -18,7 +18,7 @@ ns8=$9
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_change_sys_user_package

@@ -11,7 +11,7 @@ package=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_change_sys_user_password

@@ -11,7 +11,7 @@ password=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_change_sys_user_shell

@@ -11,7 +11,7 @@ shell=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_change_web_domain_ip

@@ -13,9 +13,9 @@ ip=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
+source $V_FUNC/ip.func
 
 
 #----------------------------------------------------------#

bin/v_change_web_domain_sslcert

@@ -13,8 +13,8 @@ certificate=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_change_web_domain_sslhome

@@ -13,8 +13,8 @@ tpl_option=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_change_web_domain_tpl

@@ -13,8 +13,8 @@ template=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_db_base

@@ -11,8 +11,8 @@ database=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/db.func
 
 
 #----------------------------------------------------------#

bin/v_del_db_dbases

@@ -10,8 +10,8 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/db.func
 
 
 #----------------------------------------------------------#

bin/v_del_db_host

@@ -11,8 +11,8 @@ host=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/db.func
 
 
 #----------------------------------------------------------#

bin/v_del_dns_domain

@@ -12,8 +12,8 @@ named_conf=/etc/named.conf
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_dns_domain_record

@@ -13,8 +13,8 @@ id=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_dns_domains

@@ -10,8 +10,8 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_ssl_certificate

@@ -11,8 +11,8 @@ cert=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/cert_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/cert.func
 
 
 #----------------------------------------------------------#

bin/v_del_sys_cron

@@ -11,8 +11,8 @@ job=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/cron_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/cron.func
 
 
 #----------------------------------------------------------#

bin/v_del_sys_ip

@@ -10,9 +10,9 @@ ip=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/ip_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/ip.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_sys_user

@@ -10,10 +10,10 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
-source $V_FUNC/db_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
+source $V_FUNC/db.func
+source $V_FUNC/ip.func
 source $V_CONF/vesta.conf
 
 

bin/v_del_sys_user_reports

@@ -10,8 +10,8 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/cron_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/cron.func
 
 
 #----------------------------------------------------------#

bin/v_del_web_domain

@@ -12,9 +12,9 @@ domain_idn=$(idn -t --quiet -a "$domain")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
+source $V_FUNC/ip.func
 
 
 #----------------------------------------------------------#

bin/v_del_web_domain_alias

@@ -14,8 +14,8 @@ dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_web_domain_cgi

@@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_web_domain_elog

@@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_web_domain_nginx

@@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_web_domain_ssl

@@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_web_domain_stat

@@ -11,8 +11,8 @@ domain=$(idn -t --quiet -u "$2" )
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_web_domain_stat_auth

@@ -12,8 +12,8 @@ auth_user=$3
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_del_web_domains

@@ -10,8 +10,8 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_get_dns_domain_value

@@ -13,8 +13,8 @@ key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_get_sys_user_value

@@ -11,7 +11,7 @@ key=$(echo "$2"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_get_web_domain_value

@@ -13,8 +13,8 @@ key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_list_db_base

@@ -12,8 +12,8 @@ format=${3-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/db.func
 
 # Json function
 json_list_db() {

bin/v_list_db_bases

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_list_db_host

@@ -12,8 +12,8 @@ format=${3-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/db.func
 
 # Json function
 json_list_dbhost() {

bin/v_list_db_hosts

@@ -12,7 +12,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_list_dns_domain

@@ -12,8 +12,8 @@ format=${3-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 # Json func
 json_list_dns() {

bin/v_list_dns_domains

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_list_dns_template

@@ -11,8 +11,8 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_list_dns_templates

@@ -10,7 +10,7 @@ format=${1-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 # Json function
 json_list_dnstpl() {

bin/v_list_ssl_certificates

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 # Json function
 json_list_cert() {

bin/v_list_sys_cron

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 # Json function
 json_list_cron() {

bin/v_list_sys_interfaces

@@ -10,7 +10,7 @@ format=${1-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 # Json function
 json_list_iface() {

bin/v_list_sys_ip

@@ -12,8 +12,8 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/ip.func
 
 # Json function
 json_list_ip() {

bin/v_list_sys_ips

@@ -10,7 +10,7 @@ format=${1-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 # Json function
 json_list_ips() {

bin/v_list_sys_user

@@ -12,7 +12,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 # Json function
 json_list_user() {

bin/v_list_sys_user_ips

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 # Json function
 json_list_user_ips() {

bin/v_list_sys_user_ns

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 # Json function
 json_list_ns() {

bin/v_list_sys_user_packages

@@ -10,7 +10,7 @@ format=${1-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 # Json function
 json_list_pkgs() {

bin/v_list_sys_users

@@ -10,7 +10,7 @@ format=${1-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 # Json function
 json_list_users() {

bin/v_list_web_domain

@@ -12,8 +12,8 @@ format=${3-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 # Json function
 json_list_domain() {

bin/v_list_web_domains

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_list_web_domains_alias

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_list_web_domains_elog

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_list_web_domains_nginx

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_list_web_domains_ssl

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_list_web_domains_stats

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_list_web_templates

@@ -11,7 +11,7 @@ format=${2-shell}
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
+source $V_FUNC/shared.func
 
 
 #----------------------------------------------------------#

bin/v_rebuild_dns_domains

@@ -10,9 +10,9 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
+source $V_FUNC/ip.func
 
 
 #----------------------------------------------------------#

bin/v_rebuild_sys_cron

@@ -10,8 +10,8 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/cron_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/cron.func
 
 
 #----------------------------------------------------------#

bin/v_rebuild_web_domains

@@ -10,9 +10,9 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
-source $V_FUNC/ip_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
+source $V_FUNC/ip.func
 
 url=${2-$V_SUSPEND_URL}
 

func/restart_dns → bin/v_restart_dns

@@ -3,20 +3,20 @@
 # dns system restart
 
 # Importing variables
+source /etc/profile.d/vesta.sh
+source $VESTA/conf/vesta.conf
 source $VESTA/conf/vars.conf
 
 bind() {
-    /etc/init.d/named 'reload' >/dev/null 2>&1
+    /etc/init.d/named reload >/dev/null 2>&1
     if [ $? -ne 0 ]; then
         #$V_FUNC/report_issue 'sys' 'cron'
         echo "$E_RESTART_FAILED $V_EVENT"
     fi
 }
 
-# Parsing config / or just source config
-dns_system=$(grep 'DNS_SYSTEM=' $V_CONF/vesta.conf | cut -f 2 -d \' )
 
-if [ "$dns_system" = 'bind' ]; then
+if [ "$DNS_SYSTEM" = 'bind' ]; then
     bind
 fi
 

bin/v_suspend_db_base

@@ -11,8 +11,8 @@ database=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/db.func
 
 
 #----------------------------------------------------------#

bin/v_suspend_db_bases

@@ -10,8 +10,8 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/db_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/db.func
 
 
 #----------------------------------------------------------#

bin/v_suspend_dns_domain

@@ -12,8 +12,8 @@ domain_idn=$(idn -t --quiet -a "$domain")
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_suspend_dns_domains

@@ -10,8 +10,8 @@ user=$1
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/domain_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/domain.func
 
 
 #----------------------------------------------------------#

bin/v_suspend_sys_cron_job

@@ -11,8 +11,8 @@ job=$2
 
 # Importing variables
 source $VESTA/conf/vars.conf
-source $V_FUNC/shared_func.sh
-source $V_FUNC/cron_func.sh
+source $V_FUNC/shared.func
+source $V_FUNC/cron.func
 
 
 #----------------------------------------------------------#