mirror of
https://github.com/myvesta/vesta
synced 2025-08-14 10:37:42 -07:00
renamed api function per naming convention
This commit is contained in:
parent
f7d1d2c84e
commit
94ddaa3622
84 changed files with 40 additions and 40 deletions
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
#----------------------------------------------------------#
|
Binary file not shown.
|
@ -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"
|
|
@ -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"
|
|
@ -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
|
|
@ -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
|
|
@ -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"
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
}
|
|
@ -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
|
|
@ -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"
|
Loading…
Add table
Add a link
Reference in a new issue