From 94ddaa3622e07f5cf274c203fb5e014c262f629a Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 20 Dec 2011 21:38:29 +0200 Subject: [PATCH] renamed api function per naming convention --- bin/{v_add_sys_cron => v_add_cron_job} | 2 +- bin/v_add_db_base | 2 +- bin/v_add_dns_domain | 2 +- bin/v_add_dns_domain_record | 2 +- bin/{v_add_sys_user => v_add_user} | 8 ++++---- ..._add_sys_user_backup => v_add_user_backup} | 0 ...dd_sys_user_reports => v_add_user_reports} | 2 +- bin/v_add_web_domain | 2 +- bin/v_add_web_domain_alias | 2 +- bin/v_add_web_domain_cgi | 2 +- bin/v_add_web_domain_elog | 2 +- bin/v_add_web_domain_nginx | 2 +- bin/v_add_web_domain_ssl | 2 +- bin/v_add_web_domain_stat | 4 ++-- bin/v_add_web_domain_stat_auth | 2 +- bin/{v_backup_sys_user => v_backup_user} | 0 bin/{v_backup_sys_users => v_backup_users} | 2 +- ..._change_sys_cron_job => v_change_cron_job} | 0 ...sys_user_contact => v_change_user_contact} | 0 ...hange_sys_user_name => v_change_user_name} | 0 ...{v_change_sys_user_ns => v_change_user_ns} | 0 ...sys_user_package => v_change_user_package} | 0 ...s_user_password => v_change_user_password} | 0 ...nge_sys_user_shell => v_change_user_shell} | 0 ...ys_user_password => v_check_user_password} | Bin 7413 -> 7409 bytes bin/{v_del_sys_cron => v_delete_cron_job} | 0 bin/{v_del_db_base => v_delete_db_base} | 0 bin/{v_del_db_dbases => v_delete_db_dbases} | 2 +- bin/{v_del_db_host => v_delete_db_host} | 0 bin/{v_del_dns_domain => v_delete_dns_domain} | 0 ...main_record => v_delete_dns_domain_record} | 0 ...v_del_dns_domains => v_delete_dns_domains} | 2 +- bin/{v_del_sys_ip => v_delete_sys_ip} | 0 bin/{v_del_sys_user => v_delete_user} | 8 ++++---- bin/{v_del_sys_user_ips => v_delete_user_ips} | 0 ...sys_user_reports => v_delete_user_reports} | 2 +- bin/{v_del_web_domain => v_delete_web_domain} | 0 ...domain_alias => v_delete_web_domain_alias} | 0 ...web_domain_cgi => v_delete_web_domain_cgi} | 0 ...b_domain_elog => v_delete_web_domain_elog} | 0 ...domain_nginx => v_delete_web_domain_nginx} | 0 ...web_domain_ssl => v_delete_web_domain_ssl} | 0 ...b_domain_stat => v_delete_web_domain_stat} | 0 ...tat_auth => v_delete_web_domain_stat_auth} | 0 ...v_del_web_domains => v_delete_web_domains} | 2 +- ...{v_get_sys_user_value => v_get_user_value} | 0 bin/{v_list_sys_cron => v_list_cron_jobs} | 0 bin/{v_list_sys_user => v_list_user} | 0 ...t_sys_user_backups => v_list_user_backups} | 0 bin/{v_list_sys_user_ips => v_list_user_ips} | 0 bin/{v_list_sys_user_ns => v_list_user_ns} | 0 ...sys_user_packages => v_list_user_packages} | 0 bin/{v_list_sys_users => v_list_users} | 0 ...v_rebuild_sys_cron => v_rebuild_cron_jobs} | 0 ...uspend_sys_cron_job => v_suspend_cron_job} | 0 ...pend_sys_cron_jobs => v_suspend_cron_jobs} | 0 bin/{v_suspend_sys_user => v_suspend_user} | 2 +- ...pend_sys_cron_job => v_unsuspend_cron_job} | 0 ...nd_sys_cron_jobs => v_unsuspend_cron_jobs} | 0 ...{v_unsuspend_sys_user => v_unsuspend_user} | 2 +- ...upd_db_base_disk => v_update_db_base_disk} | 0 ...d_db_bases_disk => v_update_db_bases_disk} | 0 bin/{v_upd_sys_ip => v_update_sys_ip} | 0 bin/{v_upd_sys_queue => v_update_sys_queue} | 2 +- bin/{v_upd_sys_rrd => v_update_sys_rrd} | 18 +++++++++--------- ...v_upd_sys_rrd_ftp => v_update_sys_rrd_ftp} | 0 ...d_sys_rrd_httpd => v_update_sys_rrd_httpd} | 0 bin/{v_upd_sys_rrd_la => v_update_sys_rrd_la} | 0 ...v_upd_sys_rrd_mem => v_update_sys_rrd_mem} | 0 ...d_sys_rrd_mysql => v_update_sys_rrd_mysql} | 0 ...v_upd_sys_rrd_net => v_update_sys_rrd_net} | 0 ...d_sys_rrd_nginx => v_update_sys_rrd_nginx} | 0 ...d_sys_rrd_pgsql => v_update_sys_rrd_pgsql} | 0 ...v_upd_sys_rrd_ssh => v_update_sys_rrd_ssh} | 0 bin/{v_upd_sys_vesta => v_update_sys_vesta} | 0 ...sys_user_backups => v_update_user_backups} | 0 ...v_upd_sys_user_bill => v_update_user_bill} | 0 ...v_upd_sys_user_disk => v_update_user_disk} | 0 ...b_domain_disk => v_update_web_domain_disk} | 0 ...b_domain_stat => v_update_web_domain_stat} | 0 ...domain_traff => v_update_web_domain_traff} | 0 ...domains_disk => v_update_web_domains_disk} | 0 ...domains_stat => v_update_web_domains_stat} | 2 +- ...mains_traff => v_update_web_domains_traff} | 0 84 files changed, 40 insertions(+), 40 deletions(-) rename bin/{v_add_sys_cron => v_add_cron_job} (97%) rename bin/{v_add_sys_user => v_add_user} (94%) rename bin/{v_add_sys_user_backup => v_add_user_backup} (100%) rename bin/{v_add_sys_user_reports => v_add_user_reports} (96%) rename bin/{v_backup_sys_user => v_backup_user} (100%) rename bin/{v_backup_sys_users => v_backup_users} (92%) rename bin/{v_change_sys_cron_job => v_change_cron_job} (100%) rename bin/{v_change_sys_user_contact => v_change_user_contact} (100%) rename bin/{v_change_sys_user_name => v_change_user_name} (100%) rename bin/{v_change_sys_user_ns => v_change_user_ns} (100%) rename bin/{v_change_sys_user_package => v_change_user_package} (100%) rename bin/{v_change_sys_user_password => v_change_user_password} (100%) rename bin/{v_change_sys_user_shell => v_change_user_shell} (100%) rename bin/{v_check_sys_user_password => v_check_user_password} (90%) rename bin/{v_del_sys_cron => v_delete_cron_job} (100%) rename bin/{v_del_db_base => v_delete_db_base} (100%) rename bin/{v_del_db_dbases => v_delete_db_dbases} (97%) rename bin/{v_del_db_host => v_delete_db_host} (100%) rename bin/{v_del_dns_domain => v_delete_dns_domain} (100%) rename bin/{v_del_dns_domain_record => v_delete_dns_domain_record} (100%) rename bin/{v_del_dns_domains => v_delete_dns_domains} (96%) rename bin/{v_del_sys_ip => v_delete_sys_ip} (100%) rename bin/{v_del_sys_user => v_delete_user} (95%) rename bin/{v_del_sys_user_ips => v_delete_user_ips} (100%) rename bin/{v_del_sys_user_reports => v_delete_user_reports} (96%) rename bin/{v_del_web_domain => v_delete_web_domain} (100%) rename bin/{v_del_web_domain_alias => v_delete_web_domain_alias} (100%) rename bin/{v_del_web_domain_cgi => v_delete_web_domain_cgi} (100%) rename bin/{v_del_web_domain_elog => v_delete_web_domain_elog} (100%) rename bin/{v_del_web_domain_nginx => v_delete_web_domain_nginx} (100%) rename bin/{v_del_web_domain_ssl => v_delete_web_domain_ssl} (100%) rename bin/{v_del_web_domain_stat => v_delete_web_domain_stat} (100%) rename bin/{v_del_web_domain_stat_auth => v_delete_web_domain_stat_auth} (100%) rename bin/{v_del_web_domains => v_delete_web_domains} (96%) rename bin/{v_get_sys_user_value => v_get_user_value} (100%) rename bin/{v_list_sys_cron => v_list_cron_jobs} (100%) rename bin/{v_list_sys_user => v_list_user} (100%) rename bin/{v_list_sys_user_backups => v_list_user_backups} (100%) rename bin/{v_list_sys_user_ips => v_list_user_ips} (100%) rename bin/{v_list_sys_user_ns => v_list_user_ns} (100%) rename bin/{v_list_sys_user_packages => v_list_user_packages} (100%) rename bin/{v_list_sys_users => v_list_users} (100%) rename bin/{v_rebuild_sys_cron => v_rebuild_cron_jobs} (100%) rename bin/{v_suspend_sys_cron_job => v_suspend_cron_job} (100%) rename bin/{v_suspend_sys_cron_jobs => v_suspend_cron_jobs} (100%) rename bin/{v_suspend_sys_user => v_suspend_user} (97%) rename bin/{v_unsuspend_sys_cron_job => v_unsuspend_cron_job} (100%) rename bin/{v_unsuspend_sys_cron_jobs => v_unsuspend_cron_jobs} (100%) rename bin/{v_unsuspend_sys_user => v_unsuspend_user} (97%) rename bin/{v_upd_db_base_disk => v_update_db_base_disk} (100%) rename bin/{v_upd_db_bases_disk => v_update_db_bases_disk} (100%) rename bin/{v_upd_sys_ip => v_update_sys_ip} (100%) rename bin/{v_upd_sys_queue => v_update_sys_queue} (97%) rename bin/{v_upd_sys_rrd => v_update_sys_rrd} (78%) rename bin/{v_upd_sys_rrd_ftp => v_update_sys_rrd_ftp} (100%) rename bin/{v_upd_sys_rrd_httpd => v_update_sys_rrd_httpd} (100%) rename bin/{v_upd_sys_rrd_la => v_update_sys_rrd_la} (100%) rename bin/{v_upd_sys_rrd_mem => v_update_sys_rrd_mem} (100%) rename bin/{v_upd_sys_rrd_mysql => v_update_sys_rrd_mysql} (100%) rename bin/{v_upd_sys_rrd_net => v_update_sys_rrd_net} (100%) rename bin/{v_upd_sys_rrd_nginx => v_update_sys_rrd_nginx} (100%) rename bin/{v_upd_sys_rrd_pgsql => v_update_sys_rrd_pgsql} (100%) rename bin/{v_upd_sys_rrd_ssh => v_update_sys_rrd_ssh} (100%) rename bin/{v_upd_sys_vesta => v_update_sys_vesta} (100%) rename bin/{v_upd_sys_user_backups => v_update_user_backups} (100%) rename bin/{v_upd_sys_user_bill => v_update_user_bill} (100%) rename bin/{v_upd_sys_user_disk => v_update_user_disk} (100%) rename bin/{v_upd_web_domain_disk => v_update_web_domain_disk} (100%) rename bin/{v_upd_web_domain_stat => v_update_web_domain_stat} (100%) rename bin/{v_upd_web_domain_traff => v_update_web_domain_traff} (100%) rename bin/{v_upd_web_domains_disk => v_update_web_domains_disk} (100%) rename bin/{v_upd_web_domains_stat => v_update_web_domains_stat} (96%) rename bin/{v_upd_web_domains_traff => v_update_web_domains_traff} (100%) diff --git a/bin/v_add_sys_cron b/bin/v_add_cron_job similarity index 97% rename from bin/v_add_sys_cron rename to bin/v_add_cron_job index 5a9352ce5..d442aee8b 100755 --- a/bin/v_add_sys_cron +++ b/bin/v_add_cron_job @@ -77,7 +77,7 @@ sync_cron_jobs restart_schedule 'cron' # Logging -log_history "$V_EVENT" "v_del_sys_cron $user $job" +log_history "$V_EVENT" "v_delete_cron_job $user $job" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_db_base b/bin/v_add_db_base index 40198c4df..d517e4230 100755 --- a/bin/v_add_db_base +++ b/bin/v_add_db_base @@ -86,7 +86,7 @@ echo "$v_str">>$V_USERS/$user/db.conf V_EVENT="$V_DATE $V_SCRIPT $user $database $db_user ***** $type $host" # Logging -log_history "$V_EVENT" "v_del_db_base $user $database" +log_history "$V_EVENT" "v_delete_db_base $user $database" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_dns_domain b/bin/v_add_dns_domain index 182f24472..33ab789e6 100755 --- a/bin/v_add_dns_domain +++ b/bin/v_add_dns_domain @@ -115,7 +115,7 @@ increase_user_value "$user" '$U_DNS_DOMAINS' restart_schedule 'dns' # Logging -log_history "$V_EVENT" "v_del_dns_domain $user $domain" +log_history "$V_EVENT" "v_delete_dns_domain $user $domain" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_dns_domain_record b/bin/v_add_dns_domain_record index a6c067894..8f9e13cdb 100755 --- a/bin/v_add_dns_domain_record +++ b/bin/v_add_dns_domain_record @@ -85,7 +85,7 @@ update_domain_zone restart_schedule 'dns' # Logging -log_history "$V_EVENT" "v_del_dns_domain_record $user $domain $id" +log_history "$V_EVENT" "v_delete_dns_domain_record $user $domain $id" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_sys_user b/bin/v_add_user similarity index 94% rename from bin/v_add_sys_user rename to bin/v_add_user index b92ab8c59..3fa90340e 100755 --- a/bin/v_add_sys_user +++ b/bin/v_add_user @@ -109,13 +109,13 @@ mkdir $V_USERS/$user # Creating configuration files and pipes touch $V_USERS/$user/user.conf -echo "v_upd_sys_user_disk $user" >> $V_QUEUE/disk.pipe +echo "v_update_user_disk $user" >> $V_QUEUE/disk.pipe if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then mkdir $V_USERS/$user/ssl touch $V_USERS/$user/web.conf - echo "$V_BIN/v_upd_web_domains_traff $user" >> $V_QUEUE/traffic.pipe - echo "v_upd_web_domains_disk $user" >> $V_QUEUE/disk.pipe + echo "$V_BIN/v_update_web_domains_traff $user" >> $V_QUEUE/traffic.pipe + echo "v_update_web_domains_disk $user" >> $V_QUEUE/disk.pipe fi if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then @@ -131,7 +131,7 @@ fi if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then touch $V_USERS/$user/db.conf - echo "v_upd_db_bases_disk $user" >> $V_QUEUE/disk.pipe + echo "v_update_db_bases_disk $user" >> $V_QUEUE/disk.pipe fi if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then diff --git a/bin/v_add_sys_user_backup b/bin/v_add_user_backup similarity index 100% rename from bin/v_add_sys_user_backup rename to bin/v_add_user_backup diff --git a/bin/v_add_sys_user_reports b/bin/v_add_user_reports similarity index 96% rename from bin/v_add_sys_user_reports rename to bin/v_add_user_reports index 105989e52..a65925f93 100755 --- a/bin/v_add_sys_user_reports +++ b/bin/v_add_user_reports @@ -51,7 +51,7 @@ sync_cron_jobs restart_schedule 'cron' # Logging -log_history "$V_EVENT" "v_del_sys_user_reports $user" +log_history "$V_EVENT" "v_delete_user_reports $user" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain index f5a5843bf..0f53db276 100755 --- a/bin/v_add_web_domain +++ b/bin/v_add_web_domain @@ -215,7 +215,7 @@ echo "$v_str" >>$V_USERS/$user/web.conf restart_schedule 'web' # Logging -log_history "$V_EVENT" "v_del_web_domain $user $domain" +log_history "$V_EVENT" "v_delete_web_domain $user $domain" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_web_domain_alias b/bin/v_add_web_domain_alias index fed222385..6fd7cc56b 100755 --- a/bin/v_add_web_domain_alias +++ b/bin/v_add_web_domain_alias @@ -116,7 +116,7 @@ update_web_domain_value '$ALIAS' "$ALIAS" # Adding task to the vesta pipe restart_schedule 'web' -log_history "$V_EVENT" "v_del_web_domain_alias $user $domain $dom_alias" +log_history "$V_EVENT" "v_delete_web_domain_alias $user $domain $dom_alias" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_web_domain_cgi b/bin/v_add_web_domain_cgi index fbd34b742..4a216b2ae 100755 --- a/bin/v_add_web_domain_cgi +++ b/bin/v_add_web_domain_cgi @@ -83,7 +83,7 @@ update_web_domain_value '$CGI' 'yes' restart_schedule 'web' # Logging -log_history "$V_EVENT" "v_del_web_domain_cgi $user $domain" +log_history "$V_EVENT" "v_delete_web_domain_cgi $user $domain" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_web_domain_elog b/bin/v_add_web_domain_elog index 0805d06fc..bd1b35e4a 100755 --- a/bin/v_add_web_domain_elog +++ b/bin/v_add_web_domain_elog @@ -99,7 +99,7 @@ update_web_domain_value '$ELOG' 'yes' restart_schedule 'web' # Logging -log_history "$V_EVENT" "v_del_web_domain_elog $user $domain" +log_history "$V_EVENT" "v_delete_web_domain_elog $user $domain" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_web_domain_nginx b/bin/v_add_web_domain_nginx index 1121250c9..0d6329f57 100755 --- a/bin/v_add_web_domain_nginx +++ b/bin/v_add_web_domain_nginx @@ -89,7 +89,7 @@ update_web_domain_value '$NGINX_EXT' "$extentions" # Adding task to the vesta pipe restart_schedule 'web' -log_history "$V_EVENT" "v_del_web_domain_nginx $user $domain" +log_history "$V_EVENT" "v_delete_web_domain_nginx $user $domain" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_web_domain_ssl b/bin/v_add_web_domain_ssl index 1225359e6..259310509 100755 --- a/bin/v_add_web_domain_ssl +++ b/bin/v_add_web_domain_ssl @@ -131,7 +131,7 @@ update_web_domain_value '$SSL_HOME' "$SSL_HOME" update_web_domain_value '$SSL' 'yes' # Logging -log_history "$V_EVENT" "v_del_web_domain_ssl $user $domain" +log_history "$V_EVENT" "v_delete_web_domain_ssl $user $domain" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_web_domain_stat b/bin/v_add_web_domain_stat index 713ea7153..3351f2dbb 100755 --- a/bin/v_add_web_domain_stat +++ b/bin/v_add_web_domain_stat @@ -81,13 +81,13 @@ cat $V_WEBTPL/$type.tpl |\ #----------------------------------------------------------# # Adding command to pipe -echo "$V_BIN/v_upd_web_domain_stat $user $domain" >> $V_QUEUE/stats.pipe +echo "$V_BIN/v_update_web_domain_stat $user $domain" >> $V_QUEUE/stats.pipe # Adding stats in config update_web_domain_value '$STATS' "$type" # Logging -log_history "$V_EVENT" "v_del_web_domain_stat $user $domain" +log_history "$V_EVENT" "v_delete_web_domain_stat $user $domain" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_add_web_domain_stat_auth b/bin/v_add_web_domain_stat_auth index 4520e70cd..1a592e32c 100755 --- a/bin/v_add_web_domain_stat_auth +++ b/bin/v_add_web_domain_stat_auth @@ -94,7 +94,7 @@ update_web_domain_value '$STATS_AUTH' "$a_users" V_EVENT="$V_DATE $V_SCRIPT $user $domain $auth_user *****" # Logging -log_history "$V_EVENT" "v_del_web_domain_stat_auth $user $domain $auth_user" +log_history "$V_EVENT" "v_delete_web_domain_stat_auth $user $domain $auth_user" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_backup_sys_user b/bin/v_backup_user similarity index 100% rename from bin/v_backup_sys_user rename to bin/v_backup_user diff --git a/bin/v_backup_sys_users b/bin/v_backup_users similarity index 92% rename from bin/v_backup_sys_users rename to bin/v_backup_users index ea0b2b480..7ed0ff395 100755 --- a/bin/v_backup_sys_users +++ b/bin/v_backup_users @@ -24,7 +24,7 @@ user_list=$(ls $V_USERS/) # Updating user billing for user in $user_list; do - $V_BIN/v_backup_sys_user $user >> $V_LOG/backup.log 2>> $V_LOG/backup.log + $V_BIN/v_backup_user $user >> $V_LOG/backup.log 2>> $V_LOG/backup.log done #----------------------------------------------------------# diff --git a/bin/v_change_sys_cron_job b/bin/v_change_cron_job similarity index 100% rename from bin/v_change_sys_cron_job rename to bin/v_change_cron_job diff --git a/bin/v_change_sys_user_contact b/bin/v_change_user_contact similarity index 100% rename from bin/v_change_sys_user_contact rename to bin/v_change_user_contact diff --git a/bin/v_change_sys_user_name b/bin/v_change_user_name similarity index 100% rename from bin/v_change_sys_user_name rename to bin/v_change_user_name diff --git a/bin/v_change_sys_user_ns b/bin/v_change_user_ns similarity index 100% rename from bin/v_change_sys_user_ns rename to bin/v_change_user_ns diff --git a/bin/v_change_sys_user_package b/bin/v_change_user_package similarity index 100% rename from bin/v_change_sys_user_package rename to bin/v_change_user_package diff --git a/bin/v_change_sys_user_password b/bin/v_change_user_password similarity index 100% rename from bin/v_change_sys_user_password rename to bin/v_change_user_password diff --git a/bin/v_change_sys_user_shell b/bin/v_change_user_shell similarity index 100% rename from bin/v_change_sys_user_shell rename to bin/v_change_user_shell diff --git a/bin/v_check_sys_user_password b/bin/v_check_user_password similarity index 90% rename from bin/v_check_sys_user_password rename to bin/v_check_user_password index 9cc67a69838a14e5ac79a9e14d0a296c3a795c1d..4e38dac45dc6b716beac43f3e067d14150aaf58e 100755 GIT binary patch delta 12 Tcmexr`O$KNqts?ssSQj3CyWIs delta 16 Xcmexp`PFiRqZD&-W$|VQsf|nkKDGvi diff --git a/bin/v_del_sys_cron b/bin/v_delete_cron_job similarity index 100% rename from bin/v_del_sys_cron rename to bin/v_delete_cron_job diff --git a/bin/v_del_db_base b/bin/v_delete_db_base similarity index 100% rename from bin/v_del_db_base rename to bin/v_delete_db_base diff --git a/bin/v_del_db_dbases b/bin/v_delete_db_dbases similarity index 97% rename from bin/v_del_db_dbases rename to bin/v_delete_db_dbases index 6b9974d8e..da8752cf2 100755 --- a/bin/v_del_db_dbases +++ b/bin/v_delete_db_dbases @@ -50,7 +50,7 @@ databases=$(db_clear_search) # Starting delete loop for database in $databases; do - $V_BIN/v_del_db_base "$user" "$database" + $V_BIN/v_delete_db_base "$user" "$database" rv="$?" if [ "$rv" -ne '0' ]; then log_event 'debug' "$rv $V_EVENT" diff --git a/bin/v_del_db_host b/bin/v_delete_db_host similarity index 100% rename from bin/v_del_db_host rename to bin/v_delete_db_host diff --git a/bin/v_del_dns_domain b/bin/v_delete_dns_domain similarity index 100% rename from bin/v_del_dns_domain rename to bin/v_delete_dns_domain diff --git a/bin/v_del_dns_domain_record b/bin/v_delete_dns_domain_record similarity index 100% rename from bin/v_del_dns_domain_record rename to bin/v_delete_dns_domain_record diff --git a/bin/v_del_dns_domains b/bin/v_delete_dns_domains similarity index 96% rename from bin/v_del_dns_domains rename to bin/v_delete_dns_domains index edfe19af3..634664e24 100755 --- a/bin/v_del_dns_domains +++ b/bin/v_delete_dns_domains @@ -50,7 +50,7 @@ domains=$(dom_clear_search) # Starting delete loop for domain in $domains; do - $V_BIN/v_del_dns_domain "$user" "$domain" + $V_BIN/v_delete_dns_domain "$user" "$domain" rv="$?" if [ "$rv" -ne '0' ]; then log_event 'debug' "$rv $V_EVENT" diff --git a/bin/v_del_sys_ip b/bin/v_delete_sys_ip similarity index 100% rename from bin/v_del_sys_ip rename to bin/v_delete_sys_ip diff --git a/bin/v_del_sys_user b/bin/v_delete_user similarity index 95% rename from bin/v_del_sys_user rename to bin/v_delete_user index 745689921..b9f72d4b2 100755 --- a/bin/v_del_sys_user +++ b/bin/v_delete_user @@ -45,7 +45,7 @@ fi # Checking web system is enabled if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then $V_BIN/v_unsuspend_web_domains $user - $V_BIN/v_del_web_domains $user + $V_BIN/v_delete_web_domains $user rv="$?" if [ "$rv" -ne '0' ]; then exit $rv @@ -55,7 +55,7 @@ fi # Checking dns system is enabled if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then $V_BIN/v_unsuspend_dns_domains $user - $V_BIN/v_del_dns_domains $user + $V_BIN/v_delete_dns_domains $user rv="$?" if [ "$rv" -ne '0' ]; then exit $rv @@ -75,7 +75,7 @@ fi # Checking db system is enabled if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then $V_BIN/v_unsuspend_db_bases $user - $V_BIN/v_del_db_dbases $user + $V_BIN/v_delete_db_dbases $user rv="$?" if [ "$rv" -ne '0' ]; then exit $rv @@ -83,7 +83,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then fi # Checking ip -$V_BIN/v_del_sys_user_ips "$user" +$V_BIN/v_delete_user_ips "$user" rv="$?" if [ "$rv" -ne '0' ]; then exit $rv diff --git a/bin/v_del_sys_user_ips b/bin/v_delete_user_ips similarity index 100% rename from bin/v_del_sys_user_ips rename to bin/v_delete_user_ips diff --git a/bin/v_del_sys_user_reports b/bin/v_delete_user_reports similarity index 96% rename from bin/v_del_sys_user_reports rename to bin/v_delete_user_reports index 647d99d6c..e681cd370 100755 --- a/bin/v_del_sys_user_reports +++ b/bin/v_delete_user_reports @@ -51,7 +51,7 @@ sync_cron_jobs restart_schedule 'cron' # Logging -log_history "$V_EVENT" "v_add_sys_user_reports $user" +log_history "$V_EVENT" "v_add_user_reports $user" log_event 'system' "$V_EVENT" exit diff --git a/bin/v_del_web_domain b/bin/v_delete_web_domain similarity index 100% rename from bin/v_del_web_domain rename to bin/v_delete_web_domain diff --git a/bin/v_del_web_domain_alias b/bin/v_delete_web_domain_alias similarity index 100% rename from bin/v_del_web_domain_alias rename to bin/v_delete_web_domain_alias diff --git a/bin/v_del_web_domain_cgi b/bin/v_delete_web_domain_cgi similarity index 100% rename from bin/v_del_web_domain_cgi rename to bin/v_delete_web_domain_cgi diff --git a/bin/v_del_web_domain_elog b/bin/v_delete_web_domain_elog similarity index 100% rename from bin/v_del_web_domain_elog rename to bin/v_delete_web_domain_elog diff --git a/bin/v_del_web_domain_nginx b/bin/v_delete_web_domain_nginx similarity index 100% rename from bin/v_del_web_domain_nginx rename to bin/v_delete_web_domain_nginx diff --git a/bin/v_del_web_domain_ssl b/bin/v_delete_web_domain_ssl similarity index 100% rename from bin/v_del_web_domain_ssl rename to bin/v_delete_web_domain_ssl diff --git a/bin/v_del_web_domain_stat b/bin/v_delete_web_domain_stat similarity index 100% rename from bin/v_del_web_domain_stat rename to bin/v_delete_web_domain_stat diff --git a/bin/v_del_web_domain_stat_auth b/bin/v_delete_web_domain_stat_auth similarity index 100% rename from bin/v_del_web_domain_stat_auth rename to bin/v_delete_web_domain_stat_auth diff --git a/bin/v_del_web_domains b/bin/v_delete_web_domains similarity index 96% rename from bin/v_del_web_domains rename to bin/v_delete_web_domains index 8520120f9..df8049283 100755 --- a/bin/v_del_web_domains +++ b/bin/v_delete_web_domains @@ -50,7 +50,7 @@ domains=$(dom_clear_search) # Starting delete loop for domain in $domains; do - $V_BIN/v_del_web_domain "$user" "$domain" + $V_BIN/v_delete_web_domain "$user" "$domain" rv="$?" if [ "$rv" -ne '0' ]; then log_event 'debug' "$rv $V_EVENT" diff --git a/bin/v_get_sys_user_value b/bin/v_get_user_value similarity index 100% rename from bin/v_get_sys_user_value rename to bin/v_get_user_value diff --git a/bin/v_list_sys_cron b/bin/v_list_cron_jobs similarity index 100% rename from bin/v_list_sys_cron rename to bin/v_list_cron_jobs diff --git a/bin/v_list_sys_user b/bin/v_list_user similarity index 100% rename from bin/v_list_sys_user rename to bin/v_list_user diff --git a/bin/v_list_sys_user_backups b/bin/v_list_user_backups similarity index 100% rename from bin/v_list_sys_user_backups rename to bin/v_list_user_backups diff --git a/bin/v_list_sys_user_ips b/bin/v_list_user_ips similarity index 100% rename from bin/v_list_sys_user_ips rename to bin/v_list_user_ips diff --git a/bin/v_list_sys_user_ns b/bin/v_list_user_ns similarity index 100% rename from bin/v_list_sys_user_ns rename to bin/v_list_user_ns diff --git a/bin/v_list_sys_user_packages b/bin/v_list_user_packages similarity index 100% rename from bin/v_list_sys_user_packages rename to bin/v_list_user_packages diff --git a/bin/v_list_sys_users b/bin/v_list_users similarity index 100% rename from bin/v_list_sys_users rename to bin/v_list_users diff --git a/bin/v_rebuild_sys_cron b/bin/v_rebuild_cron_jobs similarity index 100% rename from bin/v_rebuild_sys_cron rename to bin/v_rebuild_cron_jobs diff --git a/bin/v_suspend_sys_cron_job b/bin/v_suspend_cron_job similarity index 100% rename from bin/v_suspend_sys_cron_job rename to bin/v_suspend_cron_job diff --git a/bin/v_suspend_sys_cron_jobs b/bin/v_suspend_cron_jobs similarity index 100% rename from bin/v_suspend_sys_cron_jobs rename to bin/v_suspend_cron_jobs diff --git a/bin/v_suspend_sys_user b/bin/v_suspend_user similarity index 97% rename from bin/v_suspend_sys_user rename to bin/v_suspend_user index 66264979f..841f37d2b 100755 --- a/bin/v_suspend_sys_user +++ b/bin/v_suspend_user @@ -63,7 +63,7 @@ fi # Suspending cron jobs if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then - $V_BIN/v_suspend_sys_cron_jobs $user + $V_BIN/v_suspend_cron_jobs $user fi diff --git a/bin/v_unsuspend_sys_cron_job b/bin/v_unsuspend_cron_job similarity index 100% rename from bin/v_unsuspend_sys_cron_job rename to bin/v_unsuspend_cron_job diff --git a/bin/v_unsuspend_sys_cron_jobs b/bin/v_unsuspend_cron_jobs similarity index 100% rename from bin/v_unsuspend_sys_cron_jobs rename to bin/v_unsuspend_cron_jobs diff --git a/bin/v_unsuspend_sys_user b/bin/v_unsuspend_user similarity index 97% rename from bin/v_unsuspend_sys_user rename to bin/v_unsuspend_user index c4fd86cda..8ee936bb0 100755 --- a/bin/v_unsuspend_sys_user +++ b/bin/v_unsuspend_user @@ -60,7 +60,7 @@ fi # Unsuspending cron jobs if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then - $V_BIN/v_unsuspend_sys_cron_jobs $user + $V_BIN/v_unsuspend_cron_jobs $user fi diff --git a/bin/v_upd_db_base_disk b/bin/v_update_db_base_disk similarity index 100% rename from bin/v_upd_db_base_disk rename to bin/v_update_db_base_disk diff --git a/bin/v_upd_db_bases_disk b/bin/v_update_db_bases_disk similarity index 100% rename from bin/v_upd_db_bases_disk rename to bin/v_update_db_bases_disk diff --git a/bin/v_upd_sys_ip b/bin/v_update_sys_ip similarity index 100% rename from bin/v_upd_sys_ip rename to bin/v_update_sys_ip diff --git a/bin/v_upd_sys_queue b/bin/v_update_sys_queue similarity index 97% rename from bin/v_upd_sys_queue rename to bin/v_update_sys_queue index fb5ce54a3..eabad6360 100755 --- a/bin/v_upd_sys_queue +++ b/bin/v_update_sys_queue @@ -39,7 +39,7 @@ traff_pipe() { backup_pipe() { for user in $(cat $V_QUEUE/backup.pipe |sort |uniq ); do sed -i "/^$user$/d" $V_QUEUE/backup.pipe - bash $V_BIN/v_backup_sys_user $user + bash $V_BIN/v_backup_user $user # Send notification to user done } diff --git a/bin/v_upd_sys_rrd b/bin/v_update_sys_rrd similarity index 78% rename from bin/v_upd_sys_rrd rename to bin/v_update_sys_rrd index 73b2e8271..ab6f63ce1 100755 --- a/bin/v_upd_sys_rrd +++ b/bin/v_update_sys_rrd @@ -28,23 +28,23 @@ period=$1 #----------------------------------------------------------# # Updateing system stats -$V_BIN/v_upd_sys_rrd_la $period -$V_BIN/v_upd_sys_rrd_net $period -$V_BIN/v_upd_sys_rrd_mem $period -$V_BIN/v_upd_sys_rrd_ssh $period +$V_BIN/v_update_sys_rrd_la $period +$V_BIN/v_update_sys_rrd_net $period +$V_BIN/v_update_sys_rrd_mem $period +$V_BIN/v_update_sys_rrd_ssh $period # Updating web stats if [ "$WEB_SYSTEM" = 'apache' ]; then - $V_BIN/v_upd_sys_rrd_httpd $period + $V_BIN/v_update_sys_rrd_httpd $period fi if [ "$PROXY_SYSTEM" = 'nginx' ]; then - $V_BIN/v_upd_sys_rrd_nginx $period + $V_BIN/v_update_sys_rrd_nginx $period fi # Updating ftp stats if [ ! -z "$FTP_SYSTEM" ] && [ "$FTP_SYSTEM" != 'no' ]; then - $V_BIN/v_upd_sys_rrd_ftp $period + $V_BIN/v_update_sys_rrd_ftp $period fi # Updating db stats @@ -52,8 +52,8 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then for type in ${DB_SYSTEM//,/ }; do # Switching on db type case $type in - mysql) $V_BIN/v_upd_sys_rrd_mysql $period ;; - pgsql) $V_BIN/v_upd_sys_rrd_pgsql $period ;; + mysql) $V_BIN/v_update_sys_rrd_mysql $period ;; + pgsql) $V_BIN/v_update_sys_rrd_pgsql $period ;; esac done fi diff --git a/bin/v_upd_sys_rrd_ftp b/bin/v_update_sys_rrd_ftp similarity index 100% rename from bin/v_upd_sys_rrd_ftp rename to bin/v_update_sys_rrd_ftp diff --git a/bin/v_upd_sys_rrd_httpd b/bin/v_update_sys_rrd_httpd similarity index 100% rename from bin/v_upd_sys_rrd_httpd rename to bin/v_update_sys_rrd_httpd diff --git a/bin/v_upd_sys_rrd_la b/bin/v_update_sys_rrd_la similarity index 100% rename from bin/v_upd_sys_rrd_la rename to bin/v_update_sys_rrd_la diff --git a/bin/v_upd_sys_rrd_mem b/bin/v_update_sys_rrd_mem similarity index 100% rename from bin/v_upd_sys_rrd_mem rename to bin/v_update_sys_rrd_mem diff --git a/bin/v_upd_sys_rrd_mysql b/bin/v_update_sys_rrd_mysql similarity index 100% rename from bin/v_upd_sys_rrd_mysql rename to bin/v_update_sys_rrd_mysql diff --git a/bin/v_upd_sys_rrd_net b/bin/v_update_sys_rrd_net similarity index 100% rename from bin/v_upd_sys_rrd_net rename to bin/v_update_sys_rrd_net diff --git a/bin/v_upd_sys_rrd_nginx b/bin/v_update_sys_rrd_nginx similarity index 100% rename from bin/v_upd_sys_rrd_nginx rename to bin/v_update_sys_rrd_nginx diff --git a/bin/v_upd_sys_rrd_pgsql b/bin/v_update_sys_rrd_pgsql similarity index 100% rename from bin/v_upd_sys_rrd_pgsql rename to bin/v_update_sys_rrd_pgsql diff --git a/bin/v_upd_sys_rrd_ssh b/bin/v_update_sys_rrd_ssh similarity index 100% rename from bin/v_upd_sys_rrd_ssh rename to bin/v_update_sys_rrd_ssh diff --git a/bin/v_upd_sys_vesta b/bin/v_update_sys_vesta similarity index 100% rename from bin/v_upd_sys_vesta rename to bin/v_update_sys_vesta diff --git a/bin/v_upd_sys_user_backups b/bin/v_update_user_backups similarity index 100% rename from bin/v_upd_sys_user_backups rename to bin/v_update_user_backups diff --git a/bin/v_upd_sys_user_bill b/bin/v_update_user_bill similarity index 100% rename from bin/v_upd_sys_user_bill rename to bin/v_update_user_bill diff --git a/bin/v_upd_sys_user_disk b/bin/v_update_user_disk similarity index 100% rename from bin/v_upd_sys_user_disk rename to bin/v_update_user_disk diff --git a/bin/v_upd_web_domain_disk b/bin/v_update_web_domain_disk similarity index 100% rename from bin/v_upd_web_domain_disk rename to bin/v_update_web_domain_disk diff --git a/bin/v_upd_web_domain_stat b/bin/v_update_web_domain_stat similarity index 100% rename from bin/v_upd_web_domain_stat rename to bin/v_update_web_domain_stat diff --git a/bin/v_upd_web_domain_traff b/bin/v_update_web_domain_traff similarity index 100% rename from bin/v_upd_web_domain_traff rename to bin/v_update_web_domain_traff diff --git a/bin/v_upd_web_domains_disk b/bin/v_update_web_domains_disk similarity index 100% rename from bin/v_upd_web_domains_disk rename to bin/v_update_web_domains_disk diff --git a/bin/v_upd_web_domains_stat b/bin/v_update_web_domains_stat similarity index 96% rename from bin/v_upd_web_domains_stat rename to bin/v_update_web_domains_stat index d9ed14331..12ade0c0a 100755 --- a/bin/v_upd_web_domains_stat +++ b/bin/v_update_web_domains_stat @@ -48,7 +48,7 @@ domains=$(dom_clear_search) for domain in $domains; do stats=$(get_web_domain_value '$STATS') if [ ! -z "$stats" ]; then - $V_BIN/v_upd_web_domain_stat "$user" "$domain" + $V_BIN/v_update_web_domain_stat "$user" "$domain" rv="$?" if [ "$rv" -ne '0' ]; then log_event 'debug' "$rv $V_EVENT" diff --git a/bin/v_upd_web_domains_traff b/bin/v_update_web_domains_traff similarity index 100% rename from bin/v_upd_web_domains_traff rename to bin/v_update_web_domains_traff