diff --git a/bin/v_add_cron_job b/bin/v_add_cron_job index 197c9057..e7394603 100755 --- a/bin/v_add_cron_job +++ b/bin/v_add_cron_job @@ -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 diff --git a/bin/v_add_cron_report b/bin/v_add_cron_report index ed92a624..0b924ca6 100755 --- a/bin/v_add_cron_report +++ b/bin/v_add_cron_report @@ -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 diff --git a/bin/v_add_database b/bin/v_add_database index 2192d2b2..e5a78fd7 100755 --- a/bin/v_add_database +++ b/bin/v_add_database @@ -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 diff --git a/bin/v_add_database_server b/bin/v_add_database_server index d747c5b5..02d1458d 100755 --- a/bin/v_add_database_server +++ b/bin/v_add_database_server @@ -73,6 +73,7 @@ chmod 660 $VESTA/conf/$type.conf #----------------------------------------------------------# # Logging +log_history "added $type database server $host" '' 'admin' log_event "$OK" "$EVENT" exit diff --git a/bin/v_add_dns_domain b/bin/v_add_dns_domain index 416e5e53..75558d21 100755 --- a/bin/v_add_dns_domain +++ b/bin/v_add_dns_domain @@ -137,7 +137,7 @@ if [ "$restart" != 'no' ]; then fi # Logging -log_history "$EVENT" +log_history "added dns domain $domain" log_event "$OK" "$EVENT" exit diff --git a/bin/v_add_dns_domain_record b/bin/v_add_dns_domain_record index 18624104..92a11b51 100755 --- a/bin/v_add_dns_domain_record +++ b/bin/v_add_dns_domain_record @@ -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 diff --git a/bin/v_add_dns_on_web_alias b/bin/v_add_dns_on_web_alias index d7e02c90..df9b92bb 100755 --- a/bin/v_add_dns_on_web_alias +++ b/bin/v_add_dns_on_web_alias @@ -76,7 +76,5 @@ fi #----------------------------------------------------------# # No Logging -#log_history "$EVENT" -#log_event "$OK" "$EVENT" exit diff --git a/bin/v_add_mail_account b/bin/v_add_mail_account index 3c9db688..141c773b 100755 --- a/bin/v_add_mail_account +++ b/bin/v_add_mail_account @@ -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 diff --git a/bin/v_add_mail_account_alias b/bin/v_add_mail_account_alias index 3b61379a..86552441 100755 --- a/bin/v_add_mail_account_alias +++ b/bin/v_add_mail_account_alias @@ -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 diff --git a/bin/v_add_mail_account_autoreply b/bin/v_add_mail_account_autoreply index 19eefd5d..bd1f86f1 100755 --- a/bin/v_add_mail_account_autoreply +++ b/bin/v_add_mail_account_autoreply @@ -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 diff --git a/bin/v_add_mail_account_forward b/bin/v_add_mail_account_forward index c00e0c09..6288098c 100755 --- a/bin/v_add_mail_account_forward +++ b/bin/v_add_mail_account_forward @@ -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 diff --git a/bin/v_add_mail_domain b/bin/v_add_mail_domain index c40a68ef..3e26d9bf 100755 --- a/bin/v_add_mail_domain +++ b/bin/v_add_mail_domain @@ -115,7 +115,7 @@ if [ "$dkim" = 'yes' ]; then fi # Logging -log_history "$EVENT" +log_history "added mail domain $domain" log_event "$OK" "$EVENT" exit diff --git a/bin/v_add_mail_domain_antispam b/bin/v_add_mail_domain_antispam index 91fdef7a..58585fc6 100755 --- a/bin/v_add_mail_domain_antispam +++ b/bin/v_add_mail_domain_antispam @@ -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 diff --git a/bin/v_add_mail_domain_antivirus b/bin/v_add_mail_domain_antivirus index e1915586..d2f689b9 100755 --- a/bin/v_add_mail_domain_antivirus +++ b/bin/v_add_mail_domain_antivirus @@ -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 diff --git a/bin/v_add_mail_domain_catchall b/bin/v_add_mail_domain_catchall index ea5f42be..ddea0d88 100755 --- a/bin/v_add_mail_domain_catchall +++ b/bin/v_add_mail_domain_catchall @@ -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 diff --git a/bin/v_add_mail_domain_dkim b/bin/v_add_mail_domain_dkim index 0616f5a4..39060ed1 100755 --- a/bin/v_add_mail_domain_dkim +++ b/bin/v_add_mail_domain_dkim @@ -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 diff --git a/bin/v_add_sys_ip b/bin/v_add_sys_ip index d2a2aeb4..e7c1c22f 100755 --- a/bin/v_add_sys_ip +++ b/bin/v_add_sys_ip @@ -94,6 +94,7 @@ if [ "$web_restart" = 'yes' ]; then fi # Logging +log_history "added system ip address $ip" '' 'admin' log_event "$OK" "$EVENT" exit diff --git a/bin/v_add_user b/bin/v_add_user index ee8b32d7..b05564b7 100755 --- a/bin/v_add_user +++ b/bin/v_add_user @@ -211,6 +211,7 @@ if [ "$user" != 'admin' ]; then fi # Logging +log_history "added system user $user" '' 'admin' log_event "$OK" "$EVENT" exit diff --git a/bin/v_add_user_package b/bin/v_add_user_package index f5376a2c..86bf4cae 100755 --- a/bin/v_add_user_package +++ b/bin/v_add_user_package @@ -69,6 +69,7 @@ chmod 644 $VESTA/data/packages/$package.pkg #----------------------------------------------------------# # Logging +log_history "added user package $package" '' 'admin' log_event "$OK" "$EVENT" exit diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain index 80c634fa..cd615c3b 100755 --- a/bin/v_add_web_domain +++ b/bin/v_add_web_domain @@ -183,7 +183,7 @@ if [ "$restart" != 'no' ]; then fi # Logging -log_history "$EVENT" +log_history "added web domain $domain" log_event "$OK" "$EVENT" exit diff --git a/bin/v_add_web_domain_alias b/bin/v_add_web_domain_alias index 3d13e708..4ef313ee 100755 --- a/bin/v_add_web_domain_alias +++ b/bin/v_add_web_domain_alias @@ -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 diff --git a/bin/v_add_web_domain_cgi b/bin/v_add_web_domain_cgi index 559461cf..7df5455c 100755 --- a/bin/v_add_web_domain_cgi +++ b/bin/v_add_web_domain_cgi @@ -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 diff --git a/bin/v_add_web_domain_elog b/bin/v_add_web_domain_elog index 1ae44fe3..2a09d68c 100755 --- a/bin/v_add_web_domain_elog +++ b/bin/v_add_web_domain_elog @@ -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 diff --git a/bin/v_add_web_domain_nginx b/bin/v_add_web_domain_nginx index f96b8c09..b1af9d38 100755 --- a/bin/v_add_web_domain_nginx +++ b/bin/v_add_web_domain_nginx @@ -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 + diff --git a/bin/v_add_web_domain_ssl b/bin/v_add_web_domain_ssl index 4be41a40..e7660175 100755 --- a/bin/v_add_web_domain_ssl +++ b/bin/v_add_web_domain_ssl @@ -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 diff --git a/bin/v_add_web_domain_stats b/bin/v_add_web_domain_stats index 9d225fbd..21793158 100755 --- a/bin/v_add_web_domain_stats +++ b/bin/v_add_web_domain_stats @@ -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 diff --git a/bin/v_add_web_domain_stats_user b/bin/v_add_web_domain_stats_user index 9ce696ac..d4d2d0b4 100755 --- a/bin/v_add_web_domain_stats_user +++ b/bin/v_add_web_domain_stats_user @@ -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 diff --git a/bin/v_change_cron_job b/bin/v_change_cron_job index b7280965..7afb1353 100755 --- a/bin/v_change_cron_job +++ b/bin/v_change_cron_job @@ -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 diff --git a/bin/v_change_database_password b/bin/v_change_database_password index 3fb91085..a4ffdbc1 100755 --- a/bin/v_change_database_password +++ b/bin/v_change_database_password @@ -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 diff --git a/bin/v_change_dns_domain_exp b/bin/v_change_dns_domain_exp index 070a2171..8ee2c0ae 100755 --- a/bin/v_change_dns_domain_exp +++ b/bin/v_change_dns_domain_exp @@ -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 diff --git a/bin/v_change_dns_domain_ip b/bin/v_change_dns_domain_ip index b81f3cc6..245e0c12 100755 --- a/bin/v_change_dns_domain_ip +++ b/bin/v_change_dns_domain_ip @@ -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 diff --git a/bin/v_change_dns_domain_record b/bin/v_change_dns_domain_record index 43e9187b..cf12ed0b 100755 --- a/bin/v_change_dns_domain_record +++ b/bin/v_change_dns_domain_record @@ -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 diff --git a/bin/v_change_dns_domain_soa b/bin/v_change_dns_domain_soa index 3eff0011..52998a20 100755 --- a/bin/v_change_dns_domain_soa +++ b/bin/v_change_dns_domain_soa @@ -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 diff --git a/bin/v_change_dns_domain_tpl b/bin/v_change_dns_domain_tpl index e80112b2..93cb80f9 100755 --- a/bin/v_change_dns_domain_tpl +++ b/bin/v_change_dns_domain_tpl @@ -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 diff --git a/bin/v_change_dns_domain_ttl b/bin/v_change_dns_domain_ttl index 73d8f45b..d7ea90f8 100755 --- a/bin/v_change_dns_domain_ttl +++ b/bin/v_change_dns_domain_ttl @@ -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 diff --git a/bin/v_change_mail_account_password b/bin/v_change_mail_account_password index 6dc04f05..412a6f2b 100755 --- a/bin/v_change_mail_account_password +++ b/bin/v_change_mail_account_password @@ -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 diff --git a/bin/v_change_mail_account_quota b/bin/v_change_mail_account_quota index 6ee123e5..005c7e28 100755 --- a/bin/v_change_mail_account_quota +++ b/bin/v_change_mail_account_quota @@ -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 diff --git a/bin/v_change_mail_domain_catchall b/bin/v_change_mail_domain_catchall index f1536e04..2f50baa9 100755 --- a/bin/v_change_mail_domain_catchall +++ b/bin/v_change_mail_domain_catchall @@ -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 diff --git a/bin/v_change_sys_ip_name b/bin/v_change_sys_ip_name index 15138cd0..dfb6b954 100755 --- a/bin/v_change_sys_ip_name +++ b/bin/v_change_sys_ip_name @@ -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 diff --git a/bin/v_change_sys_ip_owner b/bin/v_change_sys_ip_owner index 9e122f73..105c4ad2 100755 --- a/bin/v_change_sys_ip_owner +++ b/bin/v_change_sys_ip_owner @@ -75,6 +75,7 @@ fi #----------------------------------------------------------# # Logging +log_history "changed owner of $ip to $user" '' 'admin' log_event "$OK" "$EVENT" exit diff --git a/bin/v_change_sys_ip_status b/bin/v_change_sys_ip_status index 18da1602..e498895f 100755 --- a/bin/v_change_sys_ip_status +++ b/bin/v_change_sys_ip_status @@ -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 diff --git a/bin/v_change_user_contact b/bin/v_change_user_contact index 8dfa912a..a0883e64 100755 --- a/bin/v_change_user_contact +++ b/bin/v_change_user_contact @@ -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 diff --git a/bin/v_change_user_name b/bin/v_change_user_name index 969702fa..833a59fd 100755 --- a/bin/v_change_user_name +++ b/bin/v_change_user_name @@ -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 diff --git a/bin/v_change_user_ns b/bin/v_change_user_ns index 131a4549..9decfa80 100755 --- a/bin/v_change_user_ns +++ b/bin/v_change_user_ns @@ -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 diff --git a/bin/v_change_user_package b/bin/v_change_user_package index 60668f34..fae1d4b9 100755 --- a/bin/v_change_user_package +++ b/bin/v_change_user_package @@ -138,6 +138,7 @@ change_user_package #----------------------------------------------------------# # Logging +log_history "changed $user package to $package" '' 'admin' log_event "$OK" "$EVENT" exit diff --git a/bin/v_change_user_password b/bin/v_change_user_password index b418f24f..ecc5c288 100755 --- a/bin/v_change_user_password +++ b/bin/v_change_user_password @@ -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 diff --git a/bin/v_change_user_shell b/bin/v_change_user_shell index f4c0cf55..f28c8b79 100755 --- a/bin/v_change_user_shell +++ b/bin/v_change_user_shell @@ -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 diff --git a/bin/v_change_user_template b/bin/v_change_user_template index 2bf96080..4e8456a3 100755 --- a/bin/v_change_user_template +++ b/bin/v_change_user_template @@ -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 diff --git a/bin/v_change_web_domain_ip b/bin/v_change_web_domain_ip index 059724fe..88be473a 100755 --- a/bin/v_change_web_domain_ip +++ b/bin/v_change_web_domain_ip @@ -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 diff --git a/bin/v_change_web_domain_nginx_tpl b/bin/v_change_web_domain_nginx_tpl index 47282c7f..503a84a7 100755 --- a/bin/v_change_web_domain_nginx_tpl +++ b/bin/v_change_web_domain_nginx_tpl @@ -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 diff --git a/bin/v_change_web_domain_sslcert b/bin/v_change_web_domain_sslcert index c351d325..968a08c1 100755 --- a/bin/v_change_web_domain_sslcert +++ b/bin/v_change_web_domain_sslcert @@ -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 diff --git a/bin/v_change_web_domain_sslhome b/bin/v_change_web_domain_sslhome index 0808778f..46d43bc3 100755 --- a/bin/v_change_web_domain_sslhome +++ b/bin/v_change_web_domain_sslhome @@ -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 diff --git a/bin/v_change_web_domain_stats b/bin/v_change_web_domain_stats index 3cf4d3f0..bcc17c48 100755 --- a/bin/v_change_web_domain_stats +++ b/bin/v_change_web_domain_stats @@ -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 diff --git a/bin/v_change_web_domain_tpl b/bin/v_change_web_domain_tpl index b303ba9b..fc3428a0 100755 --- a/bin/v_change_web_domain_tpl +++ b/bin/v_change_web_domain_tpl @@ -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 diff --git a/bin/v_delete_cron_job b/bin/v_delete_cron_job index e975f3ff..0ddf9568 100755 --- a/bin/v_delete_cron_job +++ b/bin/v_delete_cron_job @@ -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 diff --git a/bin/v_delete_cron_reports b/bin/v_delete_cron_reports index a97fb7c1..9ae82626 100755 --- a/bin/v_delete_cron_reports +++ b/bin/v_delete_cron_reports @@ -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 diff --git a/bin/v_delete_database b/bin/v_delete_database index 645707a2..3a657865 100755 --- a/bin/v_delete_database +++ b/bin/v_delete_database @@ -59,6 +59,7 @@ decrease_dbhost_values decrease_user_value "$user" '$U_DATABASES' # Logging +log_history "deleted $database database" log_event "$OK" "$EVENT" exit diff --git a/bin/v_delete_database_server b/bin/v_delete_database_server index b0682678..843d5045 100755 --- a/bin/v_delete_database_server +++ b/bin/v_delete_database_server @@ -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 diff --git a/bin/v_delete_db_dbases b/bin/v_delete_db_dbases deleted file mode 100755 index 5c3fc7ab..00000000 --- a/bin/v_delete_db_dbases +++ /dev/null @@ -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 diff --git a/bin/v_delete_dns_domain b/bin/v_delete_dns_domain index bab2ac23..0fc4e7d2 100755 --- a/bin/v_delete_dns_domain +++ b/bin/v_delete_dns_domain @@ -64,7 +64,7 @@ fi # Logging -log_history "$EVENT" +log_history "deleted dns domain $domain" log_event "$OK" "$EVENT" exit diff --git a/bin/v_delete_dns_domain_record b/bin/v_delete_dns_domain_record index 61ede525..b94aeb7b 100755 --- a/bin/v_delete_dns_domain_record +++ b/bin/v_delete_dns_domain_record @@ -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 diff --git a/bin/v_delete_dns_on_web_alias b/bin/v_delete_dns_on_web_alias index ded43f5f..5b845234 100755 --- a/bin/v_delete_dns_on_web_alias +++ b/bin/v_delete_dns_on_web_alias @@ -74,7 +74,6 @@ fi #----------------------------------------------------------# # Logging -log_history "$EVENT" log_event "$OK" "$EVENT" exit diff --git a/bin/v_delete_mail_account b/bin/v_delete_mail_account index 3e31f596..ad8a127f 100755 --- a/bin/v_delete_mail_account +++ b/bin/v_delete_mail_account @@ -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 diff --git a/bin/v_delete_mail_account_alias b/bin/v_delete_mail_account_alias index c9c408cd..6a3744a8 100755 --- a/bin/v_delete_mail_account_alias +++ b/bin/v_delete_mail_account_alias @@ -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 diff --git a/bin/v_delete_mail_account_forward b/bin/v_delete_mail_account_forward index a3cf5dca..7066e0a7 100755 --- a/bin/v_delete_mail_account_forward +++ b/bin/v_delete_mail_account_forward @@ -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 diff --git a/bin/v_delete_mail_domain b/bin/v_delete_mail_domain index 22fca2c7..1d50f83b 100755 --- a/bin/v_delete_mail_domain +++ b/bin/v_delete_mail_domain @@ -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 diff --git a/bin/v_delete_mail_domain_antispam b/bin/v_delete_mail_domain_antispam index 504dd594..01ecb919 100755 --- a/bin/v_delete_mail_domain_antispam +++ b/bin/v_delete_mail_domain_antispam @@ -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 diff --git a/bin/v_delete_mail_domain_antivirus b/bin/v_delete_mail_domain_antivirus index 2fe7ed95..3fcc6ec7 100755 --- a/bin/v_delete_mail_domain_antivirus +++ b/bin/v_delete_mail_domain_antivirus @@ -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 diff --git a/bin/v_delete_mail_domain_catchall b/bin/v_delete_mail_domain_catchall index 82e010da..6f90b354 100755 --- a/bin/v_delete_mail_domain_catchall +++ b/bin/v_delete_mail_domain_catchall @@ -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 diff --git a/bin/v_delete_mail_domain_dkim b/bin/v_delete_mail_domain_dkim index 3c3afbf4..84082e66 100755 --- a/bin/v_delete_mail_domain_dkim +++ b/bin/v_delete_mail_domain_dkim @@ -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 diff --git a/bin/v_delete_sys_ip b/bin/v_delete_sys_ip index 54e5eca4..8701f111 100755 --- a/bin/v_delete_sys_ip +++ b/bin/v_delete_sys_ip @@ -88,6 +88,7 @@ if [ "$web_restart" = 'yes' ]; then fi # Logging +log_history "delted system ip address $ip" '' 'admin' log_event "$OK" "$EVENT" exit diff --git a/bin/v_delete_user b/bin/v_delete_user index 7cc1edae..636fc978 100755 --- a/bin/v_delete_user +++ b/bin/v_delete_user @@ -107,6 +107,7 @@ fi #----------------------------------------------------------# # Logging +log_history "deleted system user $user" '' 'admin' log_event "$OK" "$EVENT" exit diff --git a/bin/v_delete_user_backup b/bin/v_delete_user_backup index f385021a..ba3bb5f6 100755 --- a/bin/v_delete_user_backup +++ b/bin/v_delete_user_backup @@ -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 diff --git a/bin/v_delete_user_package b/bin/v_delete_user_package index f8d824c7..1867bf96 100755 --- a/bin/v_delete_user_package +++ b/bin/v_delete_user_package @@ -49,6 +49,7 @@ rm -f $VESTA/data/packages/$package.pkg # Vesta # #----------------------------------------------------------# +log_history "deleted user package $package" '' 'admin' log_event "$OK" "$EVENT" exit diff --git a/bin/v_delete_web_domain b/bin/v_delete_web_domain index 047160cd..ca5d7807 100755 --- a/bin/v_delete_web_domain +++ b/bin/v_delete_web_domain @@ -153,7 +153,7 @@ if [ "$restart" != 'no' ]; then fi # Logging -log_history "$EVENT" +log_history "deleted web domain $domain" log_event "$OK" "$EVENT" exit diff --git a/bin/v_delete_web_domain_alias b/bin/v_delete_web_domain_alias index 57160800..90ae382c 100755 --- a/bin/v_delete_web_domain_alias +++ b/bin/v_delete_web_domain_alias @@ -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 diff --git a/bin/v_delete_web_domain_cgi b/bin/v_delete_web_domain_cgi index aea0026b..3f027b52 100755 --- a/bin/v_delete_web_domain_cgi +++ b/bin/v_delete_web_domain_cgi @@ -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 diff --git a/bin/v_delete_web_domain_elog b/bin/v_delete_web_domain_elog index 341a8496..3bede3b5 100755 --- a/bin/v_delete_web_domain_elog +++ b/bin/v_delete_web_domain_elog @@ -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 diff --git a/bin/v_delete_web_domain_nginx b/bin/v_delete_web_domain_nginx index 1a8b2da4..41ac0485 100755 --- a/bin/v_delete_web_domain_nginx +++ b/bin/v_delete_web_domain_nginx @@ -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 diff --git a/bin/v_delete_web_domain_ssl b/bin/v_delete_web_domain_ssl index 31dc8277..5857a964 100755 --- a/bin/v_delete_web_domain_ssl +++ b/bin/v_delete_web_domain_ssl @@ -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 diff --git a/bin/v_delete_web_domain_stats b/bin/v_delete_web_domain_stats index 3ba402c9..e97167fd 100755 --- a/bin/v_delete_web_domain_stats +++ b/bin/v_delete_web_domain_stats @@ -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 diff --git a/bin/v_delete_web_domain_stats_user b/bin/v_delete_web_domain_stats_user index a955fa91..35f24441 100755 --- a/bin/v_delete_web_domain_stats_user +++ b/bin/v_delete_web_domain_stats_user @@ -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 diff --git a/bin/v_list_user_log b/bin/v_list_user_log index ba801e7b..0054b8c3 100755 --- a/bin/v_list_user_log +++ b/bin/v_list_user_log @@ -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 diff --git a/func/main.sh b/func/main.sh index b0aa1f68..4da0bb71 100755 --- a/func/main.sh +++ b/func/main.sh @@ -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 diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html index 91bcbd8a..98f0b42e 100644 --- a/web/templates/admin/add_user.html +++ b/web/templates/admin/add_user.html @@ -59,12 +59,12 @@ - Password generate + Password generate - - - - + + @@ -71,7 +70,7 @@ - "; ?> - "; ?> - "; ?> - "; ?> + "; ?> + "; ?> + "; ?> + "; ?>