From 1a0c915e15d491f67c1b8051e810c0a70b364c36 Mon Sep 17 00:00:00 2001
From: Jordi Sanfeliu <jordi@fibranet.cat>
Date: Wed, 27 Nov 2024 08:32:58 +0100
Subject: [PATCH] removed obsolete configuration options: secure_log,
 secure_log_date_format, imap_log, imap_log_date_format, hylafax_log, cups_log
 and cg_logdir

---
 man/man5/monitorix.conf.5 | 48 ---------------------------------------
 monitorix.conf            |  9 --------
 2 files changed, 57 deletions(-)

diff --git a/man/man5/monitorix.conf.5 b/man/man5/monitorix.conf.5
index 38d3e8b0..702ed980 100644
--- a/man/man5/monitorix.conf.5
+++ b/man/man5/monitorix.conf.5
@@ -478,13 +478,6 @@ If you leave this option blank or undefined Monitorix will log using the standar
 Default value: \fI/var/log/monitorix\fP
 .RE
 .P
-.BI secure_log
-.RS
-This is the path to the system log (also known as \fIauth.log\fP, etc.) Monitorix uses this file to report SSH, POP3, FTP and Telnet successful logins.
-.P
-Default value: \fI/var/log/secure\fP
-.RE
-.P
 .BI mail_log
 .RS
 This is the path to the mail log file. Monitorix uses this file to report messages sent (supporting Sendmail and Postfix formats), and the MailScanner log format for spam-mail and virus-mail alerts.
@@ -499,27 +492,6 @@ This is the path to the dump file of \fImilter-greylist\fP.
 Default value: \fI/var/milter-greylist/greylist.db\fP
 .RE
 .P
-.BI imap_log
-.RS
-This is the path to the IMAP (Dovecot or UW-IMAP) log file. Monitorix uses this file to report IMAP and POP3 successful logins.
-.P
-Default value: \fI/var/log/imap\fP
-.RE
-.P
-.BI hylafax_log
-.RS
-This is the path to the Hylafax log file. Monitorix uses this file to report successful FAX dispatches.
-.P
-Default value: \fI/var/spool/hylafax/etc/xferfaxlog\fP
-.RE
-.P
-.BI cups_log
-.RS
-This is the path to the CUPS page log file. Monitorix uses this file to report on print jobs.
-.P
-Default value: \fI/var/log/cups/page_log\fP
-.RE
-.P
 .BI ftp_log
 .RS
 This is the path to the FTP server (ProFTPD, vsftpd or Pure-FTPd) log. Monitorix uses this file to report FTP successful logins and other FTP-related information.
@@ -548,13 +520,6 @@ This is the path to the Clamav log file. Monitorix uses this file to report viru
 Default value: \fI/var/log/clamav/clamav.log\fP
 .RE
 .P
-.BI cg_logdir
-.RS
-This is the path to the CommuniGate logs directory. Monitorix uses these files to report the number of mail messages successfully received and sent, and to report IMAP and POP3 successful logins.
-.P
-Default value: \fI/var/CommuniGate/SystemLogs/\fP
-.RE
-.P
 .BI squid_log
 .RS
 This is the path to the Squid log file. Monitorix uses this file to report on Squid Proxy requests.
@@ -562,19 +527,6 @@ This is the path to the Squid log file. Monitorix uses this file to report on Sq
 Default value: \fI/var/log/squid/access.log\fP
 .RE
 .P
-.BI imap_log_date_format
-.RS
-This is the Dovecot date format as it appears in the \fBimap_log\fP file.
-.P
-Default value: \fI%b %d\fP
-.RE
-.P
-.BI secure_log_date_format
-.RS
-This is \fIsecure_log\fP date format.
-.P
-Default value: \fI%b %e\fP
-.RE
 .SS Piwik tracking code
 .BI enabled
 .RS
diff --git a/monitorix.conf b/monitorix.conf
index af4671ee..b7a0b7a2 100644
--- a/monitorix.conf
+++ b/monitorix.conf
@@ -49,23 +49,14 @@ base_cgi = /monitorix-cgi
 # Log files pathnames
 # -----------------------------------------------------------------------------
 log_file	= /var/log/monitorix
-secure_log	= /var/log/secure
 mail_log	= /var/log/maillog
 milter_gl	= /var/milter-greylist/greylist.db
-imap_log	= /var/log/imap
-hylafax_log	= /var/spool/hylafax/etc/xferfaxlog
-cups_log	= /var/log/cups/page_log
 ftp_log		= /var/log/proftpd/access.log # Check monitorix.conf(5) manpage how to edit your ProFTPD server.
 fail2ban_log	= /var/log/fail2ban.log
 spamassassin_log	= /var/log/maillog
 clamav_log	= /var/log/clamav/clamav.log
-cg_logdir	= /var/CommuniGate/SystemLogs/
 squid_log	= /var/log/squid/access.log
 
-imap_log_date_format = %b %d
-secure_log_date_format = %b %e
-
-
 <piwik_tracking>
 	enabled = n
 	url = "://example.com/piwik/"