diff --git a/bin/v_list_db_base b/bin/v_list_db_base index 5d507d670..9102ea464 100755 --- a/bin/v_list_db_base +++ b/bin/v_list_db_base @@ -122,7 +122,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_db_bases b/bin/v_list_db_bases index 6e0bc3ab0..1ce91ac42 100755 --- a/bin/v_list_db_bases +++ b/bin/v_list_db_bases @@ -51,7 +51,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_db_host b/bin/v_list_db_host index 98f27d5b5..f1e50fb6c 100755 --- a/bin/v_list_db_host +++ b/bin/v_list_db_host @@ -120,7 +120,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_db_hosts b/bin/v_list_db_hosts index 72ffd65ab..8df7918a1 100755 --- a/bin/v_list_db_hosts +++ b/bin/v_list_db_hosts @@ -53,7 +53,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_dns_domain b/bin/v_list_dns_domain index 74bdb8997..ff5e0f931 100755 --- a/bin/v_list_dns_domain +++ b/bin/v_list_dns_domain @@ -137,7 +137,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_dns_domains b/bin/v_list_dns_domains index 6bbdf68c9..925978562 100755 --- a/bin/v_list_dns_domains +++ b/bin/v_list_dns_domains @@ -53,7 +53,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_dns_template b/bin/v_list_dns_template index 5211073f7..4bb18ff09 100755 --- a/bin/v_list_dns_template +++ b/bin/v_list_dns_template @@ -132,7 +132,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_dns_templates b/bin/v_list_dns_templates index 5fa73fee1..fa348b2dd 100755 --- a/bin/v_list_dns_templates +++ b/bin/v_list_dns_templates @@ -77,7 +77,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_ssl_certificates b/bin/v_list_ssl_certificates index 981ecca86..a850842a0 100755 --- a/bin/v_list_ssl_certificates +++ b/bin/v_list_ssl_certificates @@ -83,7 +83,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_sys_cron b/bin/v_list_sys_cron index ec687b74c..486e01d4d 100755 --- a/bin/v_list_sys_cron +++ b/bin/v_list_sys_cron @@ -135,7 +135,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_sys_interfaces b/bin/v_list_sys_interfaces index 79f1418b7..fe5e4d390 100755 --- a/bin/v_list_sys_interfaces +++ b/bin/v_list_sys_interfaces @@ -62,7 +62,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_sys_ip b/bin/v_list_sys_ip index 45c6d994b..610460ab9 100755 --- a/bin/v_list_sys_ip +++ b/bin/v_list_sys_ip @@ -106,7 +106,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_sys_ips b/bin/v_list_sys_ips index 8334ff460..b73b4e85a 100755 --- a/bin/v_list_sys_ips +++ b/bin/v_list_sys_ips @@ -100,7 +100,7 @@ conf=$V_IPS/* # Defining fileds to select fields="\$IP \$OWNER \$STATUS \$NAME \$U_SYS_USERS \$U_WEB_DOMAINS" -field=s"$fields \$INTERFACE \$NETMASK \$DATE" +fields="$fields \$INTERFACE \$NETMASK \$DATE" # Listing domains case $format in @@ -116,7 +116,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_sys_user b/bin/v_list_sys_user index b2c9d55f2..95630c915 100755 --- a/bin/v_list_sys_user +++ b/bin/v_list_sys_user @@ -113,7 +113,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_sys_user_backups b/bin/v_list_sys_user_backups index 890e679ad..9252ea3e5 100755 --- a/bin/v_list_sys_user_backups +++ b/bin/v_list_sys_user_backups @@ -52,7 +52,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_sys_user_ips b/bin/v_list_sys_user_ips index 1e1ccf235..891aae0a5 100755 --- a/bin/v_list_sys_user_ips +++ b/bin/v_list_sys_user_ips @@ -137,7 +137,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_sys_user_ns b/bin/v_list_sys_user_ns index b1fcda008..a313d91d2 100755 --- a/bin/v_list_sys_user_ns +++ b/bin/v_list_sys_user_ns @@ -79,7 +79,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_sys_user_packages b/bin/v_list_sys_user_packages index 325bf2c8c..2d70af149 100755 --- a/bin/v_list_sys_user_packages +++ b/bin/v_list_sys_user_packages @@ -110,7 +110,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_sys_users b/bin/v_list_sys_users index 1b347371c..fb97701b7 100755 --- a/bin/v_list_sys_users +++ b/bin/v_list_sys_users @@ -111,7 +111,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_web_domain b/bin/v_list_web_domain index 5463975a1..fb699f5df 100755 --- a/bin/v_list_web_domain +++ b/bin/v_list_web_domain @@ -58,7 +58,7 @@ json_list_domain() { # Shell function shell_list_domain() { - line=$(cat $V_USERS/$user/web.conf) + line=$(grep "DOMAIN='$domain'" $conf) # Parsing key=value for key in $line; do @@ -111,7 +111,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_web_domains b/bin/v_list_web_domains index 59ea10401..c4d00526e 100755 --- a/bin/v_list_web_domains +++ b/bin/v_list_web_domains @@ -54,7 +54,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_web_domains_alias b/bin/v_list_web_domains_alias index 94457ec07..d49af9c99 100755 --- a/bin/v_list_web_domains_alias +++ b/bin/v_list_web_domains_alias @@ -51,7 +51,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_web_domains_elog b/bin/v_list_web_domains_elog index 222007e47..b26e4f673 100755 --- a/bin/v_list_web_domains_elog +++ b/bin/v_list_web_domains_elog @@ -51,7 +51,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_web_domains_nginx b/bin/v_list_web_domains_nginx index 974564c1c..00c1dcf20 100755 --- a/bin/v_list_web_domains_nginx +++ b/bin/v_list_web_domains_nginx @@ -51,7 +51,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_web_domains_ssl b/bin/v_list_web_domains_ssl index 2af32b71a..61793af17 100755 --- a/bin/v_list_web_domains_ssl +++ b/bin/v_list_web_domains_ssl @@ -51,7 +51,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_web_domains_stats b/bin/v_list_web_domains_stats index 5ee96f328..bc15fbe2b 100755 --- a/bin/v_list_web_domains_stats +++ b/bin/v_list_web_domains_stats @@ -51,7 +51,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit diff --git a/bin/v_list_web_templates b/bin/v_list_web_templates index 35344a476..5fe4e7395 100755 --- a/bin/v_list_web_templates +++ b/bin/v_list_web_templates @@ -88,7 +88,4 @@ esac # Vesta # #----------------------------------------------------------# -# Logging -log_event 'system' "$V_EVENT" - exit