github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-21 05:44:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

new history logging system

Browse source
This commit is contained in:
Serghey Rodin 2012-09-21 16:02:37 +03:00
commit 2369cbced5
86 changed files with 106 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v_add_cron_job
View file

@ -75,7 +75,7 @@ increase_user_value $user '$U_CRON_JOBS'
$BIN/v_restart_cron "$EVENT"
# Logging
log_history "$EVENT"
log_history "added cron job $job"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_cron_report
View file

@ -48,7 +48,7 @@ sync_cron_jobs
$BIN/v_restart_cron "$EVENT"
# Logging
log_history "$EVENT"
log_history "enabled cron reporting"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_database
View file

@ -80,7 +80,7 @@ echo "$str" >> $USER_DATA/db.conf
chmod 660 $USER_DATA/db.conf
# Logging
log_history "$EVENT"
log_history "added $type database $database"
log_event "$OK" "$EVENT"
exit

1
bin/v_add_database_server
View file

@ -73,6 +73,7 @@ chmod 660 $VESTA/conf/$type.conf
#----------------------------------------------------------#
# Logging
log_history "added $type database server $host" '' 'admin'
log_event "$OK" "$EVENT"
exit

2
bin/v_add_dns_domain
View file

@ -137,7 +137,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "added dns domain $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_dns_domain_record
View file

@ -86,7 +86,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "added $rtype dns record $record for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_dns_on_web_alias
View file

@ -76,7 +76,5 @@ fi
#----------------------------------------------------------#
# No Logging
#log_history "$EVENT"
#log_event "$OK" "$EVENT"
exit

2
bin/v_add_mail_account
View file

@ -67,7 +67,7 @@ increase_user_value "$user" '$U_MAIL_ACCOUNTS'
update_object_value 'mail' 'DOMAIN' "$domain" '$ACCOUNTS' "$accounts"
# Logging
log_history "$EVENT"
log_history "added mail account $account@$domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_mail_account_alias
View file

@ -62,7 +62,7 @@ fi
update_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS' "$aliases"
# Logging
log_history "$EVENT"
log_history "added alias $malias to $account@$domain "
log_event "$OK" "$EVENT"
exit

2
bin/v_add_mail_account_autoreply
View file

@ -58,7 +58,7 @@ chmod 660 $USER_DATA/mail/$account@$domain.msg
update_object_value "mail/$domain" 'ACCOUNT' "$account" '$AUTOREPLY' 'yes'
# Logging
log_history "$EVENT"
log_history "added autoreply message on $account@$domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_mail_account_forward
View file

@ -67,7 +67,7 @@ echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
update_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD' "$fwd"
# Logging
log_history "$EVENT"
log_history "added forwarding from $account@$domain to $forward"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_mail_domain
View file

@ -115,7 +115,7 @@ if [ "$dkim" = 'yes' ]; then
fi
# Logging
log_history "$EVENT"
log_history "added mail domain $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_mail_domain_antispam
View file

@ -52,7 +52,7 @@ fi
update_object_value 'mail' 'DOMAIN' "$domain" '$ANTISPAM' 'yes'
# Logging
log_history "$EVENT"
log_history "enabled antispam on $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_mail_domain_antivirus
View file

@ -53,7 +53,7 @@ fi
update_object_value 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS' 'yes'
# Logging
log_history "$EVENT"
log_history "enabled antivirus on $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_mail_domain_catchall
View file

@ -54,7 +54,7 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
# Logging
log_history "$EVENT"
log_history "added $email as catchall email for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_mail_domain_dkim
View file

@ -75,7 +75,7 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$DKIM' 'yes'
increase_user_value "$user" '$U_MAIL_DKMI'
# Logging
log_history "$EVENT"
log_history "enabled DKIM support for $domain"
log_event "$OK" "$EVENT"
exit

1
bin/v_add_sys_ip
View file

@ -94,6 +94,7 @@ if [ "$web_restart" = 'yes' ]; then
fi
# Logging
log_history "added system ip address $ip" '' 'admin'
log_event "$OK" "$EVENT"
exit

1
bin/v_add_user
View file

@ -211,6 +211,7 @@ if [ "$user" != 'admin' ]; then
fi
# Logging
log_history "added system user $user" '' 'admin'
log_event "$OK" "$EVENT"
exit

1
bin/v_add_user_package
View file

@ -69,6 +69,7 @@ chmod 644 $VESTA/data/packages/$package.pkg
#----------------------------------------------------------#
# Logging
log_history "added user package $package" '' 'admin'
log_event "$OK" "$EVENT"
exit

2
bin/v_add_web_domain
View file

@ -183,7 +183,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "added web domain $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_web_domain_alias
View file

@ -103,7 +103,7 @@ if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
fi
log_history "$EVENT"
log_history "added $dom_alias as alias for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_web_domain_cgi
View file

@ -74,7 +74,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$CGI' 'yes'
$BIN/v_restart_web "$EVENT"
# Logging
log_history "$EVENT"
log_history "enabled cgi support for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_web_domain_elog
View file

@ -93,7 +93,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "enabled error logging for $domain"
log_event "$OK" "$EVENT"
exit

3
bin/v_add_web_domain_nginx
View file

@ -104,7 +104,8 @@ if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
fi
log_history "$EVENT"
log_history "enabled nginx support for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_web_domain_ssl
View file

@ -130,7 +130,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "enabled ssl support for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_add_web_domain_stats
View file

@ -78,7 +78,7 @@ echo "$BIN/v_update_web_domain_stat $user $domain" >> \
update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type"
# Logging
log_history "$EVENT"
log_history "enabled web log analyzer for $domain"
log_event "$OK" "$EVENT"
# Build stats

2
bin/v_add_web_domain_stats_user
View file

@ -66,7 +66,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$STATS_USER' "$stats_user"
update_object_value 'web' 'DOMAIN' "$domain" '$STATS_CRYPT' "$stats_crypt"
# Logging
log_history "$EVENT"
log_history "added password protection for web stats on $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_cron_job
View file

@ -67,7 +67,7 @@ sync_cron_jobs
$BIN/v_restart_cron "$EVENT"
# Logging
log_history "$EVENT"
log_history "changed cron job $job"
log_event "$OK" "$EVENT"
exit

1
bin/v_change_database_password
View file

@ -59,6 +59,7 @@ esac
update_object_value 'db' 'DB' "$database" '$MD5' "$md5"
# Logging
log_history "changed $database database password"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_dns_domain_exp
View file

@ -47,7 +47,7 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$EXP' "$exp"
#----------------------------------------------------------#
# Logging
log_history "$EVENT"
log_history "changed whois expiriation date for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_dns_domain_ip
View file

@ -59,7 +59,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "changed dns ip for $domain to $ip"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_dns_domain_record
View file

@ -71,7 +71,7 @@ update_domain_zone
$BIN/v_restart_dns "$EVENT"
# Logging
log_history "$EVENT"
log_history "changed dns record on $domain to $dvalue"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_dns_domain_soa
View file

@ -57,7 +57,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "changed soa record for $domain to $soa"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_dns_domain_tpl
View file

@ -78,7 +78,7 @@ update_domain_zone
$BIN/v_restart_dns "$EVENT"
# Logging
log_history "$EVENT"
log_history "changed dns template for $domain to $template" '' 'admin'
log_event "$OK" "$EVENT"
exit

2
bin/v_change_dns_domain_ttl
View file

@ -56,7 +56,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "changed TTL for $domain to $ttl"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_mail_account_password
View file

@ -60,7 +60,7 @@ echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
update_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5' "$md5"
# Logging
log_history "$EVENT"
log_history "changed password for $account@$domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_mail_account_quota
View file

@ -56,7 +56,7 @@ echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
update_object_value "mail/$domain" 'ACCOUNT' "$account" '$QUOTA' "$quota"
# Logging
log_history "$EVENT"
log_history "changed mail quota for $account@$domain to $quota"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_mail_domain_catchall
View file

@ -53,7 +53,7 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
# Logging
log_history "$EVENT"
log_history "changed catchall email for $domain to $email"
log_event "$OK" "$EVENT"
exit

1
bin/v_change_sys_ip_name
View file

@ -41,6 +41,7 @@ update_ip_value '$NAME' "$ip_name"
#----------------------------------------------------------#
# Logging
log_history "changed associated dns on $ip to $domain" '' 'admin'
log_event "$OK" "$EVENT"
exit

1
bin/v_change_sys_ip_owner
View file

@ -75,6 +75,7 @@ fi
#----------------------------------------------------------#
# Logging
log_history "changed owner of $ip to $user" '' 'admin'
log_event "$OK" "$EVENT"
exit

1
bin/v_change_sys_ip_status
View file

@ -54,6 +54,7 @@ update_ip_value '$STATUS' "$ip_status"
#----------------------------------------------------------#
# Logging
log_history "changed $ip status to $ip_status" '' 'admin'
log_event "$OK" "$EVENT"
exit

2
bin/v_change_user_contact
View file

@ -45,7 +45,7 @@ sed -i "$str s/$old_email/$email/g" /etc/passwd
#----------------------------------------------------------#
# Logging
log_history "$EVENT"
log_history "changed contact email to $email"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_user_name
View file

@ -47,7 +47,7 @@ update_user_value "$user" '$LNAME' "$lname"
#----------------------------------------------------------#
# Logging
log_history "$EVENT"
log_history "changed user name to $fname $lname"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_user_ns
View file

@ -60,7 +60,7 @@ update_user_value "$user" '$NS' "$ns"
#----------------------------------------------------------#
# Logging
log_history "$EVENT"
log_history "changed user nameservers to $ns1, $ns2"
log_event "$OK" "$EVENT"
exit

1
bin/v_change_user_package
View file

@ -138,6 +138,7 @@ change_user_package
#----------------------------------------------------------#
# Logging
log_history "changed $user package to $package" '' 'admin'
log_event "$OK" "$EVENT"
exit

1
bin/v_change_user_password
View file

@ -51,6 +51,7 @@ update_user_value "$user" '$RKEY' "$(gen_password)"
update_user_value "$user" '$MD5' "$md5"
# Logging
log_history "changed password"
log_event "$OK" "$EVENT"
exit

1
bin/v_change_user_shell
View file

@ -48,6 +48,7 @@ shell=$(basename $shell_path)
update_user_value "$user" '$SHELL' "$shell"
# Logging
log_history "changed $user shell to $shell" '' 'admin'
log_event "$OK" "$EVENT"
exit

1
bin/v_change_user_template
View file

@ -43,6 +43,7 @@ is_apache_template_valid
update_user_value "$user" '$TEMPLATE' "$template"
# Logging
log_history "changed $user template to $template" '' 'admin'
log_event "$OK" "$EVENT"
exit

2
bin/v_change_web_domain_ip
View file

@ -90,7 +90,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "changed web domain $domain ip to $ip"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_web_domain_nginx_tpl
View file

@ -95,7 +95,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "changed nginx template for $domain to $template"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_web_domain_sslcert
View file

@ -73,7 +73,7 @@ fi
$BIN/v_restart_web "$EVENT"
# Logging
log_history "$EVENT"
log_history "changed ssl certificate for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_web_domain_sslhome
View file

@ -73,7 +73,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
$BIN/v_restart_web "$EVENT"
# Logging
log_history "$EVENT"
log_history "changed ssl home for $domain to $ssl_home"
log_event "$OK" "$EVENT"
exit

2
bin/v_change_web_domain_stats
View file

@ -86,7 +86,7 @@ cat $WEBTPL/$type.tpl |\
update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type"
# Logging
log_history "$EVENT"
log_history "changed web log stats for $domain to $type"
log_event "$OK" "$EVENT"
# Build stats

2
bin/v_change_web_domain_tpl
View file

@ -104,7 +104,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "changed web domain template for $domain to $template" '' 'admin'
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_cron_job
View file

@ -56,7 +56,7 @@ decrease_user_value "$user" '$U_CRON_JOBS'
$BIN/v_restart_cron "$EVENT"
# Logging
log_history "$EVENT"
log_history "deleted cron job $job"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_cron_reports
View file

@ -48,7 +48,7 @@ sync_cron_jobs
$BIN/v_restart_cron "$EVENT"
# Logging
log_history "$EVENT"
log_history "disabled cron reporting"
log_event "$OK" "$EVENT"
exit

1
bin/v_delete_database
View file

@ -59,6 +59,7 @@ decrease_dbhost_values
decrease_user_value "$user" '$U_DATABASES'
# Logging
log_history "deleted $database database"
log_event "$OK" "$EVENT"
exit

1
bin/v_delete_database_server
View file

@ -44,6 +44,7 @@ sed -i "/HOST='$host' /d" $VESTA/conf/$type.conf
#----------------------------------------------------------#
# Logging
log_history "deleted $type database server $host" '' 'admin'
log_event "$OK" "$EVENT"
exit

73
bin/v_delete_db_dbases
View file

@ -1,73 +0,0 @@
#!/bin/bash
# info: delete user databases
# options: user
#
# The function deletes all user databases.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Argument defenition
user=$1
# Importing variables
source $VESTA/conf/vars.conf
source $V_CONF/vesta.conf
source $V_FUNC/shared.func
source $V_FUNC/db.func
#----------------------------------------------------------#
# Verifications #
#----------------------------------------------------------#
# Checking arg number
check_args '1' "$#" 'user'
# Checking argument format
format_validation 'user'
# Checking web system is enabled
is_system_enabled 'db'
# Checking user
is_user_valid
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/db.conf"
# Defining fileds to select
field='$DB'
# Defining search string
search_string="SUSPEND='no'"
# Parsing unsuspeneded domains
databases=$(db_clear_search)
# Starting delete loop
for database in $databases; do
$V_BIN/v_delete_db_base "$user" "$database"
rv="$?"
if [ "$rv" -ne '0' ]; then
log_event 'debug' "$rv $V_EVENT"
exit $rv
fi
done
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
# Logging
log_event 'system' "$V_EVENT"
exit

2
bin/v_delete_dns_domain
View file

@ -64,7 +64,7 @@ fi
# Logging
log_history "$EVENT"
log_history "deleted dns domain $domain"
log_event "$OK" "$EVENT"
exit

1
bin/v_delete_dns_domain_record
View file

@ -58,6 +58,7 @@ decrease_user_value "$user" '$U_DNS_RECORDS'
$BIN/v_restart_dns "$EVENT"
# Logging
log_history "deleted dns record $id on $domain"
log_event "$OK" "$EVENT"
exit

1
bin/v_delete_dns_on_web_alias
View file

@ -74,7 +74,6 @@ fi
#----------------------------------------------------------#
# Logging
log_history "$EVENT"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_mail_account
View file

@ -64,7 +64,7 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$ACCOUNTS' "$accounts"
# Logging
log_history "$EVENT"
log_history "deleted $account@$domain mail account"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_mail_account_alias
View file

@ -64,7 +64,7 @@ aliases=$(echo "$aliases" |\
update_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS' "$aliases"
# Logging
log_history "$EVENT"
log_history "deleted alias $malias on $account@$domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_mail_account_forward
View file

@ -66,7 +66,7 @@ echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
update_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD' "$fwd"
# Logging
log_history "$EVENT"
log_history "deleted $forward forward on $account@$domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_mail_domain
View file

@ -66,7 +66,7 @@ decrease_user_value "$user" '$U_MAIL_ACCOUNTS' "$accounts"
# Logging
log_history "$EVENT"
log_history "deleted mail domain $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_mail_domain_antispam
View file

@ -51,7 +51,7 @@ sed -i "/antispam/d" $HOMEDIR/$user/conf/mail/$domain/protection
update_object_value 'mail' 'DOMAIN' "$domain" '$ANTISPAM' 'no'
# Logging
log_history "$EVENT"
log_history "disabled antispam support for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_mail_domain_antivirus
View file

@ -51,7 +51,7 @@ sed -i "/antivirus/d" $HOMEDIR/$user/conf/mail/$domain/protection
update_object_value 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS' 'no'
# Logging
log_history "$EVENT"
log_history "disabled antivirus support on $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_mail_domain_catchall
View file

@ -51,7 +51,7 @@ sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' ''
# Logging
log_history "$EVENT"
log_history "delted catchall email on $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_mail_domain_dkim
View file

@ -63,7 +63,7 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$DKIM' 'no'
decrease_user_value "$user" '$U_MAIL_DKMI'
# Logging
log_history "$EVENT"
log_history "disabled DKIM support on $domain"
log_event "$OK" "$EVENT"
exit

1
bin/v_delete_sys_ip
View file

@ -88,6 +88,7 @@ if [ "$web_restart" = 'yes' ]; then
fi
# Logging
log_history "delted system ip address $ip" '' 'admin'
log_event "$OK" "$EVENT"
exit

1
bin/v_delete_user
View file

@ -107,6 +107,7 @@ fi
#----------------------------------------------------------#
# Logging
log_history "deleted system user $user" '' 'admin'
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_user_backup
View file

@ -47,7 +47,7 @@ U_BACKUPS=$(ls $BACKUP/|grep "^$user."|wc -l)
update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS"
# Logging
log_history "$EVENT"
log_history "deleted backup archive $backup"
log_event "$OK" "$EVENT"
exit

1
bin/v_delete_user_package
View file

@ -49,6 +49,7 @@ rm -f $VESTA/data/packages/$package.pkg
# Vesta #
#----------------------------------------------------------#
log_history "deleted user package $package" '' 'admin'
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_web_domain
View file

@ -153,7 +153,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "deleted web domain $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_web_domain_alias
View file

@ -102,7 +102,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "deleted alias $dom_alias on $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_web_domain_cgi
View file

@ -73,7 +73,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$CGI' 'no'
$BIN/v_restart_web "$EVENT"
# Logging
log_history "$EVENT"
log_history "disabled cgi support for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_web_domain_elog
View file

@ -91,7 +91,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "disabled error logging for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_web_domain_nginx
View file

@ -81,7 +81,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "disabled nginx support for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_web_domain_ssl
View file

@ -95,7 +95,7 @@ if [ "$restart" != 'no' ]; then
fi
# Logging
log_history "$EVENT"
log_history "disabled ssl support for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_web_domain_stats
View file

@ -62,7 +62,7 @@ sed -i "/ $domain$/d" $VESTA/data/queue/stats.pipe
update_object_value 'web' 'DOMAIN' "$domain" '$STATS' ''
# Logging
log_history "$EVENT"
log_history "disabled web log analyzer for $domain"
log_event "$OK" "$EVENT"
exit

2
bin/v_delete_web_domain_stats_user
View file

@ -55,7 +55,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$STATS_CRYPT' ''
# Logging
log_history "$EVENT"
log_history "disabled web stats password protection for $domain"
log_event "$OK" "$EVENT"
exit

7
bin/v_list_user_log
View file

@ -69,15 +69,14 @@ is_object_valid 'user' 'USER' "$user"
conf=$USER_DATA/history.log
# Defining fileds to select
fields="\$DATE\$TIME \$CMD \$A1 \$A2 \$A3 \$A4 \$A5 \$A6 \$A7 \$A8 \$A9"
fields="$fields \$TIME \$DATE"
fields="\$ID \$DATE \$TIME \$CMD \$UNDO"
# Listing domains
case $format in
json) json_list_history ;;
plain) nohead=1; shell_list ;;
shell) fields="\$DATE \$TIME \$CMD \$A1 \$A2 \$A3 \$A4 \$A5 \$A6 \$A7"
shell_list ;;
shell) fields='$ID~$DATE~$TIME~$CMD';
shell_list |column -t -s '~';;
*) check_args '1' '0' 'user [format]'
esac

16
func/main.sh
View file

@ -57,13 +57,27 @@ log_event() {
# Log user history
log_history() {
cmd=$1
undo=${2-no}
log_user="$3"
if [ -z "$log_user" ]; then
log_user="$user"
fi
touch $USER_DATA/history.log
if [ '99' -lt "$(wc -l $USER_DATA/history.log |cut -f 1 -d ' ')" ]; then
tail -n 99 $USER_DATA/history.log > $USER_DATA/history.log.mv
mv -f $USER_DATA/history.log.mv $USER_DATA/history.log
chmod 660 $USER_DATA/history.log
fi
echo "$1 UNDO='$2'" >> $USER_DATA/history.log
curr_str=$(grep "ID=" $VESTA/data/users/$log_user/history.log |\
cut -f 2 -d \' | sort -n | tail -n1)
id="$((curr_str +1))"
HISTORY="ID='$id' DATE='$DATE' TIME='$TIME' CMD='$cmd' UNDO='$undo'"
echo "$HISTORY" >> $VESTA/data/users/$log_user/history.log
}
# Argument list checker

2
web/templates/admin/add_user.html
View file

@ -64,7 +64,7 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="add-input" name="v_password"
<input type="text" size="20" class="add-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password; ?>>
</td>
</tr>
<tr>

13
web/templates/admin/list_log.html
View file

@ -38,9 +38,8 @@
</table>
<table class="data-col5" width="720px">
<tr>
<td class="log" style="padding: 0 0 20 0" >
<?php echo $data[$key]['CMD'] ?> <a class="log-counter-value">
<?php echo "".$data[$key]['A1']." ".$data[$key]['A2']." ".$data[$key]['A3']." ".$data[$key]['A4']." ".$data[$key]['A5']." ".$data[$key]['A6']." ".$data[$key]['A7']." ".$data[$key]['A8']." ".$data[$key]['A9'] ?>
<td class="username" style="padding: 0 0 20 0" >
<?php echo $data[$key]['CMD'] ?>
</td>
</tr>
</table>
@ -71,7 +70,7 @@
</table>
</form>
<?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:2300px\"><tr><td></td></tr></table>"; ?>
<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:233px\"><tr><td></td></tr></table>"; ?>
<?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:156px\"><tr><td></td></tr></table>"; ?>
<?php if ($i == 3) echo "<table class=\"data-spacer\" style=\"height:79px\"><tr><td></td></tr></table>"; ?>
<?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:227px\"><tr><td></td></tr></table>"; ?>
<?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:145px\"><tr><td></td></tr></table>"; ?>
<?php if ($i == 3) echo "<table class=\"data-spacer\" style=\"height:62px\"><tr><td></td></tr></table>"; ?>