optimized domain functions

Author: serghey-rodin

bin/v_add_dns_domain_record

@@ -51,7 +51,7 @@ is_user_valid
 is_user_suspended
 
 # Checking domain exist
-is_dns_domain_valid
+is_domain_valid 'dns'
 
 # Checking domain is active
 is_domain_suspended 'dns'
@@ -93,7 +93,7 @@ update_domain_zone
 
 # Updating dns domain values
 records="$(wc -l $V_USERS/$user/dns/$domain)"
-update_dns_domain_value '$RECORDS' "$records"
+update_domain_value 'dns' '$RECORDS' "$records"
 
 # Updating user counters
 increase_user_value "$user" '$U_DNS_RECORDS'

bin/v_add_web_domain_alias

@@ -46,7 +46,7 @@ is_user_valid
 is_user_suspended
 
 # Checking domain exist
-is_web_domain_valid
+is_domain_valid 'web'
 
 # Checking domain is not suspened
 is_domain_suspended 'web'
@@ -71,7 +71,7 @@ is_package_full 'web_alias'
 #----------------------------------------------------------#
 
 # Parsing domain values
-get_web_domain_values
+get_domain_values 'web'
 tpl_file="$V_WEBTPL/apache_$TPL.tpl"
 conf="$V_HOME/$user/conf/web/httpd.conf"
 
@@ -118,7 +118,7 @@ fi
 #----------------------------------------------------------#
 
 # Adding new alias
-update_web_domain_value '$ALIAS' "$ALIAS"
+update_domain_value 'web' '$ALIAS' "$ALIAS"
 
 # Update counters
 increase_user_value "$user" '$U_WEB_ALIASES'

bin/v_add_web_domain_cgi

@@ -44,21 +44,21 @@ is_user_valid
 is_user_suspended
 
 # Checking domain exist
-is_web_domain_valid
+is_domain_valid 'web'
 
 # Checking domain is not suspened
 is_domain_suspended 'web'
 
 # Checking cgi is not added
-is_web_domain_key_empty '$CGI'
+is_domain_key_empty 'web' '$CGI'
 
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
 # Parsing domain values
-get_web_domain_values
+get_domain_values 'web'
 tpl_file="$V_WEBTPL/apache_$TPL.tpl"
 conf="$V_HOME/$user/conf/web/httpd.conf"
 CGI='yes'
@@ -84,7 +84,7 @@ fi
 #----------------------------------------------------------#
 
 # Adding elog in config
-update_web_domain_value '$CGI' 'yes'
+update_domain_value 'web' '$CGI' 'yes'
 
 # Adding task to the vesta pipe
 restart_schedule 'web'

bin/v_add_web_domain_elog

@@ -42,21 +42,21 @@ is_user_valid
 is_user_suspended
 
 # Checking domain exist
-is_web_domain_valid
+is_domain_valid 'web'
 
 # Checking domain is not suspened
 is_domain_suspended 'web'
 
 # Checking errorlog is not added
-is_web_domain_key_empty '$ELOG'
+is_domain_key_empty 'web' '$ELOG'
 
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
 # Parsing domain values
-get_web_domain_values
+get_domain_values 'web'
 tpl_file="$V_WEBTPL/apache_$TPL.tpl"
 conf="$V_HOME/$user/conf/web/httpd.conf"
 ELOG='yes'
@@ -98,7 +98,7 @@ fi
 #----------------------------------------------------------#
 
 # Adding elog in config
-update_web_domain_value '$ELOG' 'yes'
+update_domain_value 'web' '$ELOG' 'yes'
 
 # Adding task to the vesta pipe
 restart_schedule 'web'

bin/v_add_web_domain_nginx

@@ -46,13 +46,13 @@ is_user_valid
 is_user_suspended
 
 # Checking domain exist
-is_web_domain_valid
+is_domain_valid 'web'
 
 # Checking domain is not suspened
 is_domain_suspended 'web'
 
 # Check nginx is not added
-is_web_domain_key_empty '$NGINX'
+is_domain_key_empty 'web' '$NGINX'
 
 # Checking template
 is_template_valid "proxy"
@@ -63,7 +63,7 @@ is_template_valid "proxy"
 #----------------------------------------------------------#
 
 # Defining domain parameters
-get_web_domain_values
+get_domain_values 'web'
 NGINX="$template"
 NGINX_EXT="$extentions"
 tpl_file="$V_WEBTPL/ngingx_vhost_$NGINX.tpl"
@@ -108,8 +108,8 @@ fi
 #----------------------------------------------------------#
 
 # Adding nginx params to config
-update_web_domain_value '$NGINX' "$NGINX"
-update_web_domain_value '$NGINX_EXT' "$extentions"
+update_domain_value 'web' '$NGINX' "$NGINX"
+update_domain_value 'web' '$NGINX_EXT' "$extentions"
 
 # Adding task to the vesta pipe
 restart_schedule 'web'

bin/v_add_web_domain_ssl

@@ -49,7 +49,7 @@ is_user_valid
 is_user_suspended
 
 # Checking domain exist
-is_web_domain_valid
+is_domain_valid 'web'
 
 # Checking domain is not suspened
 is_domain_suspended 'web'
@@ -58,7 +58,7 @@ is_domain_suspended 'web'
 is_package_full 'web_ssl'
 
 # Check ssl is not added
-is_web_domain_key_empty '$SSL'
+is_domain_key_empty 'web' '$SSL'
 
 # Checking ssl certificate
 is_web_domain_cert_valid
@@ -79,7 +79,7 @@ fi
 chmod 660 $V_USERS/$user/ssl/$domain.*
 
 # Parsing domain values
-get_web_domain_values
+get_domain_values 'web'
 conf="$V_HOME/$user/conf/web/shttpd.conf"
 tpl_file="$V_WEBTPL/apache_$TPL.stpl"
 SSL_HOME="$ssl_home"
@@ -143,8 +143,8 @@ fi
 increase_user_value "$user" '$U_WEB_SSL'
 
 # Adding ssl values
-update_web_domain_value '$SSL_HOME' "$SSL_HOME"
-update_web_domain_value '$SSL' 'yes'
+update_domain_value 'web' '$SSL_HOME' "$SSL_HOME"
+update_domain_value 'web' '$SSL' 'yes'
 
 # Logging
 log_history "$V_EVENT" "v_delete_web_domain_ssl $user $domain"

bin/v_add_web_domain_stat

@@ -46,7 +46,7 @@ is_user_valid "$user"
 is_user_suspended
 
 # Checking domain exist
-is_web_domain_valid
+is_domain_valid 'web'
 
 # Checking domain is not suspened
 is_domain_suspended 'web'
@@ -55,15 +55,15 @@ is_domain_suspended 'web'
 is_type_valid 'stat' "$type"
 
 # Check statistic is not added
-is_web_domain_key_empty '$STATS'
+is_domain_key_empty 'web' '$STATS'
 
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
 # Parse aliases
-get_web_domain_values
+get_domain_values 'web'
 
 # Preparing domain values for the template substitution
 upd_web_domain_values
@@ -92,7 +92,7 @@ cat $V_WEBTPL/$type.tpl |\
 echo "$V_BIN/v_update_web_domain_stat $user $domain" >> $V_QUEUE/stats.pipe
 
 # Adding stats in config
-update_web_domain_value '$STATS' "$type"
+update_domain_value 'web' '$STATS' "$type"
 
 # Logging
 log_history "$V_EVENT" "v_delete_web_domain_stat $user $domain"

bin/v_add_web_domain_stat_auth

@@ -42,7 +42,7 @@ is_user_valid
 is_user_suspended
 
 # Checking domain exist
-is_web_domain_valid
+is_domain_valid 'web'
 
 # Checking domain is not suspened
 is_domain_suspended 'web'
@@ -77,7 +77,7 @@ fi
 #----------------------------------------------------------#
 
 # Get current value
-curr_val=$(get_web_domain_value '$STATS_AUTH')
+curr_val=$(get_domain_value 'web' '$STATS_AUTH')
 check_uniq=$(echo "$curr_val" | grep -w "$auth_user")
 
 # Checking current users
@@ -92,7 +92,7 @@ else
 fi
 
 # Adding stats user in config
-update_web_domain_value '$STATS_AUTH' "$a_users"
+update_domain_value 'web' '$STATS_AUTH' "$a_users"
 
 # Hiding password
 V_EVENT="$V_DATE $V_SCRIPT $user $domain $auth_user *****"

bin/v_backup_user

@@ -160,7 +160,7 @@ then
 
         # Defining domain variables
         domain_idn=$(idn -t --quiet -a "$domain")
-        get_web_domain_values
+        get_domain_values 'web'
 
         # Packing data folders
         cd $V_HOME/$user/web/$domain

bin/v_change_dns_domain_exp

@@ -43,7 +43,7 @@ is_user_valid
 is_user_suspended
 
 # Checking domain exist
-is_dns_domain_valid
+is_domain_valid 'dns'
 
 # Checking domain is not suspened
 is_domain_suspended 'dns'
@@ -54,10 +54,10 @@ is_domain_suspended 'dns'
 #----------------------------------------------------------#
 
 # Get old expiriation date
-old_exp=$(get_dns_domain_value '$EXP')
+old_exp=$(get_domain_value 'dns' '$EXP')
 
 # Changing exp
-update_dns_domain_value '$EXP' "$exp"
+update_domain_value 'dns' '$EXP' "$exp"
 
 
 #----------------------------------------------------------#