From f22d4912c2e346a32a456f8c23845bd7ff55312e Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Sun, 26 Feb 2006 01:04:17 +0000
Subject: [PATCH] Fixed Apache section to point at error.log

---
 config/fail2ban.conf.default | 21 ++++++++++-----------
 debian/changelog             |  8 ++++++++
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/config/fail2ban.conf.default b/config/fail2ban.conf.default
index eb154e5e..71361454 100644
--- a/config/fail2ban.conf.default
+++ b/config/fail2ban.conf.default
@@ -258,24 +258,23 @@ port = http
 
 # Option:  logfile
 # Notes.:  logfile to monitor.
-# Values:  FILE  Default:  /var/log/apache/access.log
+# Values:  FILE  Default:  /var/log/apache/error.log
 #
-logfile = /var/log/apache/access.log
+logfile = /var/log/apache/error.log
 
 # Option:  timeregex
-# Notes.:  regex to match timestamp in Apache logfile. Seems to be
-#          Debian specific configuration
-# Values:  [08/Feb/2006:01:08:46]
+# Notes.:  regex to match timestamp in Apache error logfile.
+# Values:  [Wed Jan 05 15:08:01 2005]
 # Default: \S{3} \S{3} \d{2} \d{2}:\d{2}:\d{2} \d{4}
 #
-timeregex = \d{2}/\S{3}/\d{4}:\d{2}:\d{2}:\d{2}
+timeregex = \S{3} \S{3} \d{2} \d{2}:\d{2}:\d{2} \d{4}
 
 # Option:  timepattern
 # Notes.:  format used in "timeregex" fields definition. Note that '%' must be
 #          escaped with '%' (see http://rgruet.free.fr/PQR2.3.html#timeModule)
 # Values:  TEXT  Default:  %%a %%b %%d %%H:%%M:%%S %%Y
 #
-timepattern = %%d/%%b/%%Y:%%H:%%M:%%S
+timepattern = %%a %%b %%d %%H:%%M:%%S %%Y
 
 # Option:  failregex
 # Notes.:  regex to match the password failure messages in the logfile.
@@ -309,16 +308,16 @@ logfile = /var/log/apache/access.log
 maxfailures = 2
 
 # Option:  timeregex
-# Notes.:  regex to match timestamp in Apache logfile.
-# Values:  [Wed Jan 05 15:08:01 2005]
-# Default: \S{3} \S{3} \d{2} \d{2}:\d{2}:\d{2} \d{4}
+# Notes.:  regex to match timestamp in Apache access logfile.
+# Values:  [19/Feb/2006:08:38:18]
+# Default: \d{2}/\S{3}/\d{4}:\d{2}:\d{2}:\d{2}
 #
 timeregex = \d{2}/\S{3}/\d{4}:\d{2}:\d{2}:\d{2}
 
 # Option:  timepattern
 # Notes.:  format used in "timeregex" fields definition. Note that '%' must be
 #          escaped with '%' (see http://rgruet.free.fr/PQR2.3.html#timeModule)
-# Values:  TEXT  Default:  %%a %%b %%d %%H:%%M:%%S %%Y
+# Values:  TEXT  Default: %%d/%%b/%%Y:%%H:%%M:%%S
 #
 timepattern = %%d/%%b/%%Y:%%H:%%M:%%S
 
diff --git a/debian/changelog b/debian/changelog
index 5e21aa71..04f12895 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fail2ban (0.6.0-5) unstable; urgency=low
+
+  * Fixed Apache section: changed filepath to point at error.log, thus I had
+    to revert timeregex and timepattern to user RFC 2822 format (closes:
+    #354346)
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Sat, 25 Feb 2006 19:56:46 -0500
+
 fail2ban (0.6.0-4) unstable; urgency=low
 
   * Modifications in README.Debian to reflect a "finding" on