Browse Source

replaced underscore with dash in api syscalls

Serghey Rodin 13 năm trước cách đây
mục cha
commit
b6b7eacadb
100 tập tin đã thay đổi với 74 bổ sung74 xóa
  1. 1 1
      bin/v-add-cron-job
  2. 1 1
      bin/v-add-cron-report
  3. 1 1
      bin/v-add-database
  4. 0 0
      bin/v-add-database-server
  5. 1 1
      bin/v-add-dns-domain
  6. 1 1
      bin/v-add-dns-domain-record
  7. 4 4
      bin/v-add-dns-on-web-alias
  8. 0 0
      bin/v-add-mail-account
  9. 0 0
      bin/v-add-mail-account-alias
  10. 0 0
      bin/v-add-mail-account-autoreply
  11. 0 0
      bin/v-add-mail-account-forward
  12. 2 2
      bin/v-add-mail-domain
  13. 0 0
      bin/v-add-mail-domain-antispam
  14. 0 0
      bin/v-add-mail-domain-antivirus
  15. 0 0
      bin/v-add-mail-domain-catchall
  16. 2 2
      bin/v-add-mail-domain-dkim
  17. 1 1
      bin/v-add-sys-ip
  18. 7 7
      bin/v-add-user
  19. 0 0
      bin/v-add-user-backup
  20. 0 0
      bin/v-add-user-package
  21. 1 1
      bin/v-add-web-domain
  22. 1 1
      bin/v-add-web-domain-alias
  23. 1 1
      bin/v-add-web-domain-cgi
  24. 1 1
      bin/v-add-web-domain-elog
  25. 0 0
      bin/v-add-web-domain-ftp
  26. 1 1
      bin/v-add-web-domain-nginx
  27. 1 1
      bin/v-add-web-domain-ssl
  28. 3 3
      bin/v-add-web-domain-stats
  29. 0 0
      bin/v-add-web-domain-stats-user
  30. 0 0
      bin/v-backup-user
  31. 1 1
      bin/v-backup-users
  32. 1 1
      bin/v-change-cron-job
  33. 0 0
      bin/v-change-database-password
  34. 0 0
      bin/v-change-dns-domain-exp
  35. 1 1
      bin/v-change-dns-domain-ip
  36. 1 1
      bin/v-change-dns-domain-record
  37. 2 2
      bin/v-change-dns-domain-soa
  38. 1 1
      bin/v-change-dns-domain-tpl
  39. 1 1
      bin/v-change-dns-domain-ttl
  40. 0 0
      bin/v-change-mail-account-password
  41. 0 0
      bin/v-change-mail-account-quota
  42. 0 0
      bin/v-change-mail-domain-catchall
  43. 0 0
      bin/v-change-sys-config-value
  44. 0 0
      bin/v-change-sys-ip-name
  45. 0 0
      bin/v-change-sys-ip-owner
  46. 0 0
      bin/v-change-sys-ip-status
  47. 0 0
      bin/v-change-user-contact
  48. 0 0
      bin/v-change-user-name
  49. 0 0
      bin/v-change-user-ns
  50. 0 0
      bin/v-change-user-package
  51. 0 0
      bin/v-change-user-password
  52. 0 0
      bin/v-change-user-shell
  53. 0 0
      bin/v-change-user-template
  54. 0 0
      bin/v-change-web-domain-ftp
  55. 1 1
      bin/v-change-web-domain-ip
  56. 1 1
      bin/v-change-web-domain-nginx-tpl
  57. 1 1
      bin/v-change-web-domain-sslcert
  58. 1 1
      bin/v-change-web-domain-sslhome
  59. 1 1
      bin/v-change-web-domain-stats
  60. 1 1
      bin/v-change-web-domain-tpl
  61. 0 0
      bin/v-check-user-password
  62. 1 1
      bin/v-delete-cron-job
  63. 1 1
      bin/v-delete-cron-reports
  64. 0 0
      bin/v-delete-database
  65. 0 0
      bin/v-delete-database-server
  66. 1 1
      bin/v-delete-databases
  67. 1 1
      bin/v-delete-dns-domain
  68. 1 1
      bin/v-delete-dns-domain-record
  69. 2 2
      bin/v-delete-dns-domains
  70. 2 2
      bin/v-delete-dns-on-web-alias
  71. 0 0
      bin/v-delete-mail-account
  72. 0 0
      bin/v-delete-mail-account-alias
  73. 0 0
      bin/v-delete-mail-account-autoreply
  74. 0 0
      bin/v-delete-mail-account-forward
  75. 0 0
      bin/v-delete-mail-domain
  76. 0 0
      bin/v-delete-mail-domain-antispam
  77. 0 0
      bin/v-delete-mail-domain-antivirus
  78. 0 0
      bin/v-delete-mail-domain-catchall
  79. 2 2
      bin/v-delete-mail-domain-dkim
  80. 1 1
      bin/v-delete-mail-domains
  81. 1 1
      bin/v-delete-sys-ip
  82. 9 9
      bin/v-delete-user
  83. 0 0
      bin/v-delete-user-backup
  84. 0 0
      bin/v-delete-user-ips
  85. 0 0
      bin/v-delete-user-package
  86. 1 1
      bin/v-delete-web-domain
  87. 1 1
      bin/v-delete-web-domain-alias
  88. 1 1
      bin/v-delete-web-domain-cgi
  89. 1 1
      bin/v-delete-web-domain-elog
  90. 0 0
      bin/v-delete-web-domain-ftp
  91. 1 1
      bin/v-delete-web-domain-nginx
  92. 1 1
      bin/v-delete-web-domain-ssl
  93. 0 0
      bin/v-delete-web-domain-stats
  94. 0 0
      bin/v-delete-web-domain-stats-user
  95. 2 2
      bin/v-delete-web-domains
  96. 0 0
      bin/v-get-dns-domain-value
  97. 0 0
      bin/v-get-user-value
  98. 0 0
      bin/v-get-web-domain-value
  99. 0 0
      bin/v-list-cron-job
  100. 0 0
      bin/v-list-cron-jobs

+ 1 - 1
bin/v_add_cron_job → bin/v-add-cron-job

@@ -72,7 +72,7 @@ sync_cron_jobs
 increase_user_value $user '$U_CRON_JOBS'
 
 # Restart crond
-$BIN/v_restart_cron "$EVENT"
+$BIN/v-restart-cron "$EVENT"
 
 # Logging
 log_history "added cron job $job"

+ 1 - 1
bin/v_add_cron_report → bin/v-add-cron-report

@@ -45,7 +45,7 @@ sync_cron_jobs
 #----------------------------------------------------------#
 
 # Restart crond
-$BIN/v_restart_cron "$EVENT"
+$BIN/v-restart-cron "$EVENT"
 
 # Logging
 log_history "enabled cron reporting"

+ 1 - 1
bin/v_add_database → bin/v-add-database

@@ -3,7 +3,7 @@
 # options: user database dbuser dbpass type [host] [charset]
 #
 # The function creates the database concatenating username  and user_db.
-# Supported yypes of databases you can get using v_list_sys_config script.
+# Supported yypes of databases you can get using v-list-sys-config script.
 # If the host isn't stated and there are few hosts configured on the server,
 # then the host will be defined by one of three algorithms. "First" will choose
 # the first host in the list. "Random" will chose the host by a chance.

+ 0 - 0
bin/v_add_database_server → bin/v-add-database-server


+ 1 - 1
bin/v_add_dns_domain → bin/v-add-dns-domain

@@ -133,7 +133,7 @@ increase_user_value "$user" '$U_DNS_RECORDS' "$records"
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_dns "$EVENT"
+    $BIN/v-restart-dns "$EVENT"
 fi
 
 # Logging

+ 1 - 1
bin/v_add_dns_domain_record → bin/v-add-dns-domain-record

@@ -82,7 +82,7 @@ increase_user_value "$user" '$U_DNS_RECORDS'
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_dns "$EVENT"
+    $BIN/v-restart-dns "$EVENT"
 fi
 
 # Logging

+ 4 - 4
bin/v_add_dns_on_web_alias → bin/v-add-dns-on-web-alias

@@ -49,15 +49,15 @@ get_domain_values 'web'
 # Check if it a simple domain
 if [ $(echo -e "${dom_alias//\./\n}" | wc -l) -le 2 ]; then
     if [ ! -e "$USER_DATA/dns/$dom_alias.conf" ]; then
-        $BIN/v_add_dns_domain $user $dom_alias $IP '' '' '' '' '' $restart
+        $BIN/v-add-dns-domain $user $dom_alias $IP '' '' '' '' '' $restart
     fi
 else
     # Check subdomain
     sub=$(echo "$dom_alias" | cut -f1 -d . -s)
     dom=$(echo "$dom_alias" | sed -e "s/^$sub.//" )
     if [ ! -e "$USER_DATA/dns/$dom.conf" ]; then
-        $BIN/v_add_dns_domain $user $dom $IP '' '' '' '' '' $restart
-        $BIN/v_add_dns_domain_record $user $dom "$sub" A $IP '' '' $restart
+        $BIN/v-add-dns-domain $user $dom $IP '' '' '' '' '' $restart
+        $BIN/v-add-dns-domain-record $user $dom "$sub" A $IP '' '' $restart
     else
         if [ "$sub" == '*' ]; then
             rec=$(grep -w "RECORD='\*'" $USER_DATA/dns/$dom.conf)
@@ -65,7 +65,7 @@ else
             rec=$(grep -w "RECORD='$sub'" $USER_DATA/dns/$dom.conf)
         fi
         if [ -z "$rec" ]; then
-            $BIN/v_add_dns_domain_record $user $dom "$sub" A $IP '' '' $restart
+            $BIN/v-add-dns-domain-record $user $dom "$sub" A $IP '' '' $restart
         fi
     fi
 fi

+ 0 - 0
bin/v_add_mail_account → bin/v-add-mail-account


+ 0 - 0
bin/v_add_mail_account_alias → bin/v-add-mail-account-alias


+ 0 - 0
bin/v_add_mail_account_autoreply → bin/v-add-mail-account-autoreply


+ 0 - 0
bin/v_add_mail_account_forward → bin/v-add-mail-account-forward


+ 2 - 2
bin/v_add_mail_domain → bin/v-add-mail-domain

@@ -85,11 +85,11 @@ if [ "$dkim" = 'yes' ]; then
         p=$(cat $USER_DATA/mail/$domain.pub|grep -v ' KEY---'|tr -d '\n')
         record='_domainkey'
         policy="\"t=y; o=~;\""
-        $BIN/v_add_dns_domain_record $user $domain $record TXT "$policy"
+        $BIN/v-add-dns-domain-record $user $domain $record TXT "$policy"
 
         record='mail._domainkey'
         selector="\"k=rsa\; p=$p\""
-        $BIN/v_add_dns_domain_record $user $domain $record TXT "$selector"
+        $BIN/v-add-dns-domain-record $user $domain $record TXT "$selector"
     fi
 fi
 

+ 0 - 0
bin/v_add_mail_domain_antispam → bin/v-add-mail-domain-antispam


+ 0 - 0
bin/v_add_mail_domain_antivirus → bin/v-add-mail-domain-antivirus


+ 0 - 0
bin/v_add_mail_domain_catchall → bin/v-add-mail-domain-catchall


+ 2 - 2
bin/v_add_mail_domain_dkim → bin/v-add-mail-domain-dkim

@@ -58,11 +58,11 @@ if [ "$?" -eq 0 ]; then
     p=$(cat $USER_DATA/mail/$domain.pub|grep -v ' KEY---'|tr -d '\n')
     record='_domainkey'
     policy="\"t=y; o=~;\""
-    $BIN/v_add_dns_domain_record $user $domain $record TXT "$policy"
+    $BIN/v-add-dns-domain-record $user $domain $record TXT "$policy"
 
     record='mail._domainkey'
     selector="\"k=rsa\; p=$p\""
-    $BIN/v_add_dns_domain_record $user $domain $record TXT "$selector"
+    $BIN/v-add-dns-domain-record $user $domain $record TXT "$selector"
 fi
 
 

+ 1 - 1
bin/v_add_sys_ip → bin/v-add-sys-ip

@@ -90,7 +90,7 @@ fi
 
 # Restart web server
 if [ "$web_restart" = 'yes' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 7 - 7
bin/v_add_user → bin/v-add-user

@@ -99,7 +99,7 @@ chmod a+x $HOMEDIR/$user
 # Checking quota
 if [ ! -z "$DISK_QUOTA" ] && [ "$DISK_QUOTA" != 'no' ]; then
     DISK_QUOTA=$(echo "$pkg_data" | grep 'DISK_QUOTA' | cut -f 2 -d \')
-    #$BIN/v_add_user_quota "$user" "$DISK_QUOTA"
+    #$BIN/v-add-user_quota "$user" "$DISK_QUOTA"
 fi
 
 
@@ -119,16 +119,16 @@ chmod 660 $USER_DATA/history.log
 touch $USER_DATA/stats.log
 chmod 660 $USER_DATA/stats.log
 
-echo "v_update_user_disk $user" >> $VESTA/data/queue/disk.pipe
+echo "v-update-user-disk $user" >> $VESTA/data/queue/disk.pipe
 
 if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
     mkdir $USER_DATA/ssl
     chmod 770 $USER_DATA/ssl
     touch $USER_DATA/web.conf
     chmod 660 $USER_DATA/web.conf
-    echo "$BIN/v_update_web_domains_traff $user" \
+    echo "$BIN/v-update-web-domains-traff $user" \
         >> $VESTA/data/queue/traffic.pipe
-    echo "v_update_web_domains_disk $user" >> $VESTA/data/queue/disk.pipe
+    echo "v-update-web-domains-disk $user" >> $VESTA/data/queue/disk.pipe
 fi
 
 if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
@@ -143,13 +143,13 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
     chmod 770 $USER_DATA/mail
     touch $USER_DATA/mail.conf
     chmod 660 $USER_DATA/mail.conf
-    echo "v_update_mail_domains_disk $user" >> $VESTA/data/queue/disk.pipe
+    echo "v-update-mail-domains-disk $user" >> $VESTA/data/queue/disk.pipe
 fi
 
 if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
     touch $USER_DATA/db.conf
     chmod 660 $USER_DATA/db.conf
-    echo "v_update_databases_disk $user" >> $VESTA/data/queue/disk.pipe
+    echo "v-update-databases-disk $user" >> $VESTA/data/queue/disk.pipe
 fi
 
 if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then
@@ -159,7 +159,7 @@ fi
 
 # Filling user config
 if [ "$user" != 'admin' ]; then
-    ip_avail=$($BIN/v_list_user_ips admin plain |grep -w shared|wc -l)
+    ip_avail=$($BIN/v-list-user-ips admin plain |grep -w shared|wc -l)
     u_users=0
 else
     ip_avail=0

+ 0 - 0
bin/v_add_user_backup → bin/v-add-user-backup


+ 0 - 0
bin/v_add_user_package → bin/v-add-user-package


+ 1 - 1
bin/v_add_web_domain → bin/v-add-web-domain

@@ -180,7 +180,7 @@ chmod 660 $USER_DATA/web.conf
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 1 - 1
bin/v_add_web_domain_alias → bin/v-add-web-domain-alias

@@ -100,7 +100,7 @@ increase_user_value "$user" '$U_WEB_ALIASES'
 
 # Adding task to the vesta pipe
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 log_history "added $dom_alias as alias for $domain"

+ 1 - 1
bin/v_add_web_domain_cgi → bin/v-add-web-domain-cgi

@@ -71,7 +71,7 @@ fi
 update_object_value 'web' 'DOMAIN' "$domain" '$CGI' 'yes'
 
 # Restart web server
-$BIN/v_restart_web "$EVENT"
+$BIN/v-restart-web "$EVENT"
 
 # Logging
 log_history "enabled cgi support for $domain"

+ 1 - 1
bin/v_add_web_domain_elog → bin/v-add-web-domain-elog

@@ -89,7 +89,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ELOG' 'yes'
 
 # Adding task to the vesta pipe
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 0 - 0
bin/v_add_web_domain_ftp → bin/v-add-web-domain-ftp


+ 1 - 1
bin/v_add_web_domain_nginx → bin/v-add-web-domain-nginx

@@ -101,7 +101,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$NGINX_EXT' "$extentions"
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 log_history "enabled nginx support for $domain"

+ 1 - 1
bin/v_add_web_domain_ssl → bin/v-add-web-domain-ssl

@@ -126,7 +126,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes"
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 3 - 3
bin/v_add_web_domain_stats → bin/v-add-web-domain-stats

@@ -6,7 +6,7 @@
 # two types of these system is supported - awstats and webalizer. For viewing
 # the domain statistics use http://domain.tld/vstats/ link. Access this page
 # is not protected by default. If you want to secure it with passwords you
-# should use v_add_web_domain_stat_auth script.
+# should use v-add-web-domain_stat_auth script.
 
 
 #----------------------------------------------------------#
@@ -71,7 +71,7 @@ cat $WEBTPL/$type.tpl |\
 #----------------------------------------------------------#
 
 # Schedule statistic processing
-echo "$BIN/v_update_web_domain_stat $user $domain" >> \
+echo "$BIN/v-update-web-domain-stat $user $domain" >> \
     $VESTA/data/queue/webstats.pipe
 
 # Update config
@@ -82,6 +82,6 @@ log_history "enabled web log analyzer for $domain"
 log_event "$OK" "$EVENT"
 
 # Build stats
-exec $BIN/v_update_web_domain_stat $user $domain
+exec $BIN/v-update-web-domain-stat $user $domain
 
 exit

+ 0 - 0
bin/v_add_web_domain_stats_user → bin/v-add-web-domain-stats-user


+ 0 - 0
bin/v_backup_user → bin/v-backup-user


+ 1 - 1
bin/v_backup_users → bin/v-backup-users

@@ -25,7 +25,7 @@ source $VESTA/func/main.sh
 for user in $(ls $VESTA/data/users); do
     check_suspend=$(grep "SUSPENDED='no'" $VESTA/data/users/$user/user.conf)
     if [ ! -z "$check_suspend" ]; then
-        $BIN/v_backup_user $user >> $VESTA/log/backup.log 2>&1
+        $BIN/v-backup-user $user >> $VESTA/log/backup.log 2>&1
     fi
 done
 

+ 1 - 1
bin/v_change_cron_job → bin/v-change-cron-job

@@ -64,7 +64,7 @@ sync_cron_jobs
 #----------------------------------------------------------#
 
 # Restart crond
-$BIN/v_restart_cron "$EVENT"
+$BIN/v-restart-cron "$EVENT"
 
 # Logging
 log_history "changed cron job $job"

+ 0 - 0
bin/v_change_database_password → bin/v-change-database-password


+ 0 - 0
bin/v_change_dns_domain_exp → bin/v-change-dns-domain-exp


+ 1 - 1
bin/v_change_dns_domain_ip → bin/v-change-dns-domain-ip

@@ -55,7 +55,7 @@ update_domain_zone
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_dns "$EVENT"
+    $BIN/v-restart-dns "$EVENT"
 fi
 
 # Logging

+ 1 - 1
bin/v_change_dns_domain_record → bin/v-change-dns-domain-record

@@ -68,7 +68,7 @@ update_domain_zone
 #----------------------------------------------------------#
 
 # Restart named
-$BIN/v_restart_dns "$EVENT"
+$BIN/v-restart-dns "$EVENT"
 
 # Logging
 log_history "changed dns record on $domain to $dvalue"

+ 2 - 2
bin/v_change_dns_domain_soa → bin/v-change-dns-domain-soa

@@ -3,7 +3,7 @@
 # options: user domain soa
 #
 # The function for changing SOA record. This type of records can not be
-# modified by v_change_dns_domain_record call.
+# modified by v-change-dns-domain-record call.
 
 
 #----------------------------------------------------------#
@@ -53,7 +53,7 @@ update_domain_zone
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_dns "$EVENT"
+    $BIN/v-restart-dns "$EVENT"
 fi
 
 # Logging

+ 1 - 1
bin/v_change_dns_domain_tpl → bin/v-change-dns-domain-tpl

@@ -75,7 +75,7 @@ update_domain_zone
 #----------------------------------------------------------#
 
 # Restart named
-$BIN/v_restart_dns "$EVENT"
+$BIN/v-restart-dns "$EVENT"
 
 # Logging
 log_history "changed dns template for $domain to $template" '' 'admin'

+ 1 - 1
bin/v_change_dns_domain_ttl → bin/v-change-dns-domain-ttl

@@ -52,7 +52,7 @@ update_domain_zone
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_dns "$EVENT"
+    $BIN/v-restart-dns "$EVENT"
 fi
 
 # Logging

+ 0 - 0
bin/v_change_mail_account_password → bin/v-change-mail-account-password


+ 0 - 0
bin/v_change_mail_account_quota → bin/v-change-mail-account-quota


+ 0 - 0
bin/v_change_mail_domain_catchall → bin/v-change-mail-domain-catchall


+ 0 - 0
bin/v_change_sys_config_value → bin/v-change-sys-config-value


+ 0 - 0
bin/v_change_sys_ip_name → bin/v-change-sys-ip-name


+ 0 - 0
bin/v_change_sys_ip_owner → bin/v-change-sys-ip-owner


+ 0 - 0
bin/v_change_sys_ip_status → bin/v-change-sys-ip-status


+ 0 - 0
bin/v_change_user_contact → bin/v-change-user-contact


+ 0 - 0
bin/v_change_user_name → bin/v-change-user-name


+ 0 - 0
bin/v_change_user_ns → bin/v-change-user-ns


+ 0 - 0
bin/v_change_user_package → bin/v-change-user-package


+ 0 - 0
bin/v_change_user_password → bin/v-change-user-password


+ 0 - 0
bin/v_change_user_shell → bin/v-change-user-shell


+ 0 - 0
bin/v_change_user_template → bin/v-change-user-template


+ 0 - 0
bin/v_change_web_domain_ftp → bin/v-change-web-domain-ftp


+ 1 - 1
bin/v_change_web_domain_ip → bin/v-change-web-domain-ip

@@ -86,7 +86,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$ip"
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 1 - 1
bin/v_change_web_domain_nginx_tpl → bin/v-change-web-domain-nginx-tpl

@@ -91,7 +91,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$NGINX_EXT' "$extentions"
 
 # Restart web
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 1 - 1
bin/v_change_web_domain_sslcert → bin/v-change-web-domain-sslcert

@@ -70,7 +70,7 @@ fi
 #----------------------------------------------------------#
 
 # Restart web server
-$BIN/v_restart_web "$EVENT"
+$BIN/v-restart-web "$EVENT"
 
 # Logging
 log_history "changed ssl certificate for $domain"

+ 1 - 1
bin/v_change_web_domain_sslhome → bin/v-change-web-domain-sslhome

@@ -70,7 +70,7 @@ fi
 update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
 
 # Restart web server
-$BIN/v_restart_web "$EVENT"
+$BIN/v-restart-web "$EVENT"
 
 # Logging
 log_history "changed ssl home for $domain to $ssl_home"

+ 1 - 1
bin/v_change_web_domain_stats → bin/v-change-web-domain-stats

@@ -90,6 +90,6 @@ log_history "changed web log stats for $domain to $type"
 log_event "$OK" "$EVENT"
 
 # Build stats
-exec $BIN/v_update_web_domain_stat $user $domain
+exec $BIN/v-update-web-domain-stat $user $domain
 
 exit

+ 1 - 1
bin/v_change_web_domain_tpl → bin/v-change-web-domain-tpl

@@ -100,7 +100,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template"
 
 # Restart web
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 0 - 0
bin/v_check_user_password → bin/v-check-user-password


+ 1 - 1
bin/v_delete_cron_job → bin/v-delete-cron-job

@@ -53,7 +53,7 @@ sync_cron_jobs
 decrease_user_value "$user" '$U_CRON_JOBS'
 
 # Restart crond
-$BIN/v_restart_cron "$EVENT"
+$BIN/v-restart-cron "$EVENT"
 
 # Logging
 log_history "deleted cron job $job"

+ 1 - 1
bin/v_delete_cron_reports → bin/v-delete-cron-reports

@@ -45,7 +45,7 @@ sync_cron_jobs
 #----------------------------------------------------------#
 
 # Restart crond
-$BIN/v_restart_cron "$EVENT"
+$BIN/v-restart-cron "$EVENT"
 
 # Logging
 log_history "disabled cron reporting"

+ 0 - 0
bin/v_delete_database → bin/v-delete-database


+ 0 - 0
bin/v_delete_database_server → bin/v-delete-database-server


+ 1 - 1
bin/v_delete_databases → bin/v-delete-databases

@@ -34,7 +34,7 @@ is_object_unsuspended 'user' 'USER' "$user"
 
 # Starting delete loop
 for database in $(search_objects 'db' 'SUSPENDED' "no" 'DB'); do
-    $BIN/v_delete_database "$user" "$database"
+    $BIN/v-delete-database "$user" "$database"
 done
 
 

+ 1 - 1
bin/v_delete_dns_domain → bin/v-delete-dns-domain

@@ -59,7 +59,7 @@ decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_dns "$EVENT"
+    $BIN/v-restart-dns "$EVENT"
 fi
 
 

+ 1 - 1
bin/v_delete_dns_domain_record → bin/v-delete-dns-domain-record

@@ -55,7 +55,7 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
 decrease_user_value "$user" '$U_DNS_RECORDS'
 
 # Restart named
-$BIN/v_restart_dns "$EVENT"
+$BIN/v-restart-dns "$EVENT"
 
 # Logging
 log_history "deleted dns record $id on $domain"

+ 2 - 2
bin/v_delete_dns_domains → bin/v-delete-dns-domains

@@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user"
 
 # Starting delete loop
 for domain in $(search_objects 'dns' 'SUSPENDED' "no" 'DOMAIN'); do
-    $BIN/v_delete_dns_domain "$user" "$domain" 'no'
+    $BIN/v-delete-dns-domain "$user" "$domain" 'no'
 done
 
 
@@ -42,7 +42,7 @@ done
 #----------------------------------------------------------#
 
 # Restart named
-$BIN/v_restart_dns "$EVENT"
+$BIN/v-restart-dns "$EVENT"
 
 # Logging
 log_event "$OK" "$EVENT"

+ 2 - 2
bin/v_delete_dns_on_web_alias → bin/v-delete-dns-on-web-alias

@@ -49,7 +49,7 @@ get_domain_values 'web'
 # Check if it a simple domain
 if [ $(echo -e "${dom_alias//\./\n}" | wc -l) -le 2 ]; then
     if [ -e "$USER_DATA/dns/$dom_alias.conf" ]; then
-        $BIN/v_delete_dns_domain $user $dom_alias $IP $restart
+        $BIN/v-delete-dns-domain $user $dom_alias $IP $restart
     fi
 else
     # Check subdomain
@@ -63,7 +63,7 @@ else
         fi
         if [ ! -z "$rec" ]; then
             eval "$rec"
-            $BIN/v_delete_dns_domain_record $user "$root" "$ID"
+            $BIN/v-delete-dns-domain-record $user "$root" "$ID"
         fi
     fi
 fi

+ 0 - 0
bin/v_delete_mail_account → bin/v-delete-mail-account


+ 0 - 0
bin/v_delete_mail_account_alias → bin/v-delete-mail-account-alias


+ 0 - 0
bin/v_delete_mail_account_autoreply → bin/v-delete-mail-account-autoreply


+ 0 - 0
bin/v_delete_mail_account_forward → bin/v-delete-mail-account-forward


+ 0 - 0
bin/v_delete_mail_domain → bin/v-delete-mail-domain


+ 0 - 0
bin/v_delete_mail_domain_antispam → bin/v-delete-mail-domain-antispam


+ 0 - 0
bin/v_delete_mail_domain_antivirus → bin/v-delete-mail-domain-antivirus


+ 0 - 0
bin/v_delete_mail_domain_catchall → bin/v-delete-mail-domain-catchall


+ 2 - 2
bin/v_delete_mail_domain_dkim → bin/v-delete-mail-domain-dkim

@@ -46,10 +46,10 @@ rm -f $HOMEDIR/$user/conf/mail/$domain/dkim.pem
 # Checking dns domain
 check_dns_domain=$(is_object_valid 'dns' 'DOMAIN' "$domain")
 if [ "$?" -eq 0 ]; then
-    records=$($BIN/v_list_dns_domain_records $user $domain plain)
+    records=$($BIN/v-list-dns-domain-records $user $domain plain)
     dkim_records=$(echo "$records" |grep -w '_domainkey' | cut -f 1 -d ' ')
     for id in $dkim_records; do
-        $BIN/v_delete_dns_domain_record $user $domain $id
+        $BIN/v-delete-dns-domain-record $user $domain $id
     done
 fi
 

+ 1 - 1
bin/v_delete_mail_domains → bin/v-delete-mail-domains

@@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user"
 
 # Starting delete loop
 for domain in $(search_objects 'mail' 'SUSPENDED' "no" 'DOMAIN'); do
-    $BIN/v_delete_mail_domain "$user" "$domain"
+    $BIN/v-delete-mail-domain "$user" "$domain"
 done
 
 

+ 1 - 1
bin/v_delete_sys_ip → bin/v-delete-sys-ip

@@ -84,7 +84,7 @@ fi
 
 # Adding task to the vesta pipe
 if [ "$web_restart" = 'yes' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 9 - 9
bin/v_delete_user → bin/v-delete-user

@@ -40,8 +40,8 @@ fi
 
 # Checking web system is enabled
 if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
-    $BIN/v_unsuspend_web_domains $user $restart
-    $BIN/v_delete_web_domains $user $restart
+    $BIN/v-unsuspend-web-domains $user $restart
+    $BIN/v-delete-web-domains $user $restart
     rv="$?"
     if [ "$rv" -ne '0' ]; then
         exit $rv
@@ -50,8 +50,8 @@ fi
 
 # Checking dns system is enabled
 if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
-    $BIN/v_unsuspend_dns_domains $user $restart
-    $BIN/v_delete_dns_domains $user $restart
+    $BIN/v-unsuspend-dns-domains $user $restart
+    $BIN/v-delete-dns-domains $user $restart
     rv="$?"
     if [ "$rv" -ne '0' ]; then
         exit $rv
@@ -60,8 +60,8 @@ fi
 
 # Checking mail system is enabled
 if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
-    $BIN/v_unsuspend_mail_domains $user
-    $BIN/v_delete_mail_domains $user
+    $BIN/v-unsuspend-mail-domains $user
+    $BIN/v-delete-mail-domains $user
     rv="$?"
     if [ "$rv" -ne '0' ]; then
         exit $rv
@@ -70,8 +70,8 @@ fi
 
 # Checking db system is enabled
 if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
-    $BIN/v_unsuspend_databases $user
-    $BIN/v_delete_databases $user
+    $BIN/v-unsuspend-databases $user
+    $BIN/v-delete-databases $user
     rv="$?"
     if [ "$rv" -ne '0' ]; then
         exit $rv
@@ -79,7 +79,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
 fi
 
 # Checking ip
-$BIN/v_delete_user_ips "$user"
+$BIN/v-delete-user-ips "$user"
 rv="$?"
 if [ "$rv" -ne '0' ]; then
     exit $rv

+ 0 - 0
bin/v_delete_user_backup → bin/v-delete-user-backup


+ 0 - 0
bin/v_delete_user_ips → bin/v-delete-user-ips


+ 0 - 0
bin/v_delete_user_package → bin/v-delete-user-package


+ 1 - 1
bin/v_delete_web_domain → bin/v-delete-web-domain

@@ -154,7 +154,7 @@ fi
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 1 - 1
bin/v_delete_web_domain_alias → bin/v-delete-web-domain-alias

@@ -98,7 +98,7 @@ decrease_user_value "$user" '$U_WEB_ALIASES'
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 1 - 1
bin/v_delete_web_domain_cgi → bin/v-delete-web-domain-cgi

@@ -70,7 +70,7 @@ fi
 update_object_value 'web' 'DOMAIN' "$domain" '$CGI' 'no'
 
 # Restart web server
-$BIN/v_restart_web "$EVENT"
+$BIN/v-restart-web "$EVENT"
 
 # Logging
 log_history "disabled cgi support for $domain"

+ 1 - 1
bin/v_delete_web_domain_elog → bin/v-delete-web-domain-elog

@@ -87,7 +87,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ELOG' 'no'
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 0 - 0
bin/v_delete_web_domain_ftp → bin/v-delete-web-domain-ftp


+ 1 - 1
bin/v_delete_web_domain_nginx → bin/v-delete-web-domain-nginx

@@ -77,7 +77,7 @@ fi
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 1 - 1
bin/v_delete_web_domain_ssl → bin/v-delete-web-domain-ssl

@@ -91,7 +91,7 @@ decrease_user_value "$user" '$U_WEB_SSL'
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 0 - 0
bin/v_delete_web_domain_stats → bin/v-delete-web-domain-stats


+ 0 - 0
bin/v_delete_web_domain_stats_user → bin/v-delete-web-domain-stats-user


+ 2 - 2
bin/v_delete_web_domains → bin/v-delete-web-domains

@@ -34,7 +34,7 @@ is_object_valid 'user' 'USER' "$user"
 
 # Starting delete loop
 for domain in $(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'); do
-    $BIN/v_delete_web_domain "$user" "$domain" 'no'
+    $BIN/v-delete-web-domain "$user" "$domain" 'no'
 done
 
 
@@ -44,7 +44,7 @@ done
 
 # Restart web server
 if [ "$restart" != 'no' ]; then
-    $BIN/v_restart_web "$EVENT"
+    $BIN/v-restart-web "$EVENT"
 fi
 
 # Logging

+ 0 - 0
bin/v_get_dns_domain_value → bin/v-get-dns-domain-value


+ 0 - 0
bin/v_get_user_value → bin/v-get-user-value


+ 0 - 0
bin/v_get_web_domain_value → bin/v-get-web-domain-value


+ 0 - 0
bin/v_list_cron_job → bin/v-list-cron-job


+ 0 - 0
bin/v_list_cron_jobs → bin/v-list-cron-jobs


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác