Update logging messages

Kristan Kenney · Kristan Kenney · commit 449070c7e66c · 2021-03-30T13:40:43.000-03:00
diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job
@@ -88,8 +88,7 @@ $BIN/v-restart-cron
 check_result $? "Cron restart failed" >/dev/null
 
 # Logging
-$BIN/v-log-action "$user" "Info" "Cron Jobs" "Added cron job $job"
-log_history "added cron job $job"
+$BIN/v-log-action "$user" "Info" "Cron Jobs" "Cron job added (Job: $job, Command: $cmd)"
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-add-fastcgi-cache b/bin/v-add-fastcgi-cache
@@ -108,7 +108,7 @@ $BIN/v-restart-web
 check_result $? "Web server restart failed" > /dev/null
 
 # Logging
-log_history "Enabled FastCGI cache for $domain"
+$BIN/v-log-action "$user" "Info" "Web" "FastCGI cache enabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip
@@ -225,8 +225,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ ! -z "$helo"]; then
 fi
 
 # Logging
-$BIN/v-log-action "system" "Info" "Network" "Added an IP address to the system (IP: $ip)."
-log_history "added system ip address $ip" '' 'admin'
+$BIN/v-log-action "system" "Info" "Network" "Added new IP address to the system (IP: $ip)."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-add-user-ssh-key b/bin/v-add-user-ssh-key
@@ -69,7 +69,7 @@ echo "$key" >> "$AUTHKEY_FILE"
 #----------------------------------------------------------#
 
 # Logging
-log_history "Added ssh-key $user"
+$BIN/v-log-action "$user" "Info" "System" "Added a new SSH key."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-add-user-wp-cli b/bin/v-add-user-wp-cli
@@ -68,8 +68,7 @@ user_exec chmod +x $WPCLI_BIN
 #----------------------------------------------------------#
 
 # Logging
-$BIN/v-log-action "$user" "Info" "Plugins" "Enabled WP-CLI support."
-log_history "Enabled wp-cli for user $user"
+$BIN/v-log-action "$user" "Info" "Plugins" "WP-CLI support enabled."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias
@@ -113,7 +113,6 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 
 $BIN/v-log-action "$user" "Info" "Web" "Added new web domain alias (Alias: $aliases, Domain: $domain)."
-log_history "added $aliases for $domain"
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy
@@ -86,7 +86,6 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 
 $BIN/v-log-action "$user" "Info" "Web" "Proxy Enabled (Domain: $domain)."
-log_history "enabled proxy support for $domain"
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-add-web-domain-redirect b/bin/v-add-web-domain-redirect
@@ -115,7 +115,7 @@ if [ "$restart" = "yes" ]; then
 fi
 
 # Logging
-log_history "Enable forced redirect $domain"
+$BIN/v-log-action "$user" "Info" "Web" "Enabled domain redirection (Domain: $domain, Redirect to: $redirect)."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-add-web-php b/bin/v-add-web-php
@@ -133,7 +133,6 @@ cp -f $HESTIA_INSTALL_DIR/php-fpm/multiphp.tpl \
 
 # Logging
 $BIN/v-log-action "system" "Info" "System" "Installed PHP $version."
-log_history "installed php $version" '' 'admin'
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-change-cron-job b/bin/v-change-cron-job
@@ -82,8 +82,7 @@ $BIN/v-restart-cron
 check_result $? "Cron restart failed" >/dev/null
 
 # Logging
-$BIN/v-log-action "$user" "Info" "Cron Jobs" "Updated a cron job (Job: $job)."
-log_history "changed cron job $job"
+$BIN/v-log-action "$user" "Info" "Cron Jobs" "Cron job updated (Job: $job, Command: $cmd)."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall
@@ -67,7 +67,6 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
 
 # Logging
 $BIN/v-log-action "$user" "Info" "Mail" "Changed mail domain catch-all address (Domain: $domain, Send to: $email)."
-log_history "changed catchall email for $domain to $email"
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-change-mail-domain-sslcert b/bin/v-change-mail-domain-sslcert
@@ -70,7 +70,6 @@ check_result $? "Mail restart failed" >/dev/null
 
 # Logging
 $BIN/v-log-action "$user" "Info" "Web" "Changed SSL certificate (Domain: $domain)."
-log_history "changed ssl certificate for $domain"
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-change-user-password b/bin/v-change-user-password
@@ -76,8 +76,6 @@ update_user_value "$user" '$MD5' "$md5"
 # Logging
 $BIN/v-log-action "system" "Warning" "Security" "Password changed (User: $user)."
 $BIN/v-log-action "$user" "Warning" "Security" "Password changed."
-
-log_history "changed password"
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job
@@ -69,8 +69,7 @@ $BIN/v-restart-cron
 check_result $? "Restart restart failed" >/dev/null
 
 # Logging
-$BIN/v-log-action "$user" "Info" "Cron Jobs" "Cron Job deleted (Job: $job)."
-log_history "deleted cron job $job"
+$BIN/v-log-action "$user" "Info" "Cron Jobs" "Cron job deleted (Job: $job)."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-delete-fastcgi-cache b/bin/v-delete-fastcgi-cache
@@ -81,7 +81,7 @@ if [ ! -z "$restart" ]; then
 fi
 
 # Logging
-log_history "Disabled FastCGI cache for $domain"
+$BIN/v-log-action "$user" "Info" "Web" "FastCGI cache disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply
@@ -71,7 +71,6 @@ update_object_value "mail/$domain" 'ACCOUNT' "$account"  '$AUTOREPLY' 'no'
 
 # Logging
 $BIN/v-log-action "$user" "Info" "Mail" "Mail account auto-reply removed (User: $account@$domain)."
-log_history "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-delete-remote-dns-host b/bin/v-delete-remote-dns-host
@@ -66,7 +66,7 @@ fi
 #----------------------------------------------------------#
 
 # Logging
-log_history "deleted remote dns server $host" '' 'admin'
+$BIN/v-log-action "system" "Info" "System" "Removed remote DNS host (Host: $host)."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip
@@ -165,7 +165,6 @@ fi
 
 # Logging
 $BIN/v-log-action "system" "Info" "System" "IP address deleted (IP: $ip)."
-log_history "deleted system ip address $ip" '' 'admin'
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-delete-web-domain-redirect b/bin/v-delete-web-domain-redirect
@@ -72,7 +72,7 @@ if [ "$restart" = "yes" ]; then
 fi
 
 # Logging
-log_history "Enable forced redirect $domain"
+$BIN/v-log-action "$user" "Info" "Web" "Disabled domain redirection (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-purge-nginx-cache b/bin/v-purge-nginx-cache
@@ -64,7 +64,7 @@ if [ ! -z "$restart" ]; then
 fi
 
 # Logging
-log_history "Purged nginx cache for $domain"
+$BIN/v-log-action "$user" "Info" "Web" "Cache purged (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-repair-sys-config b/bin/v-repair-sys-config
@@ -33,5 +33,5 @@ fi
 #----------------------------------------------------------#
 #                        Hestia                            #
 #----------------------------------------------------------#
-log_history "executed $mode operation on system configuration file." '' 'admin'
+$BIN/v-log-action "system" "Info" "System" "Executed $mode operation on system configuration."
 log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-update-user-backup-exclusions b/bin/v-update-user-backup-exclusions
@@ -79,7 +79,7 @@ chmod 660 $USER_DATA/backup-excludes.conf
 #----------------------------------------------------------#
 
 # Logging
-log_history "updated exlusion list"
+$BIN/v-log-action "$user" "Info" "Backups" "Updated backup exclusion list."
 log_event "$OK" "$ARGUMENTS"
 
 exit
diff --git a/bin/v-update-web-domain-ssl b/bin/v-update-web-domain-ssl
@@ -92,7 +92,7 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 
 # Logging
-log_history "update ssl certificate for $domain"
+$BIN/v-log-action "$user" "Info" "Web" "SSL certificate updated (Domain: $domain)."
 log_event "$OK" "$EVENT"
 
 exit
