[Logcheck-commits] Frédéric Brière : Deleting ignore.d.server/ lpr and ignore.d.server/ntp

[Frédéric Brière]

Module: logcheck
Branch: master
Commit: 2e28b4efdb36b7cef8690ee05dde42ef046bd99d
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=2e28b4efdb36b7cef8690ee05dde42ef046bd99d

Author: Frédéric Brière <fbriere at fbriere.net>
Date:   Sun Aug 23 17:20:37 2009 -0400

Deleting ignore.d.server/lpr and ignore.d.server/ntp

These files have been included in their respective packages (lpr, ntp)
for some time now, replacing ours which are in the way.

---

 debian/changelog                    |    2 ++
 debian/logcheck-database.preinst    |    2 ++
 rulefiles/linux/ignore.d.server/lpr |    1 -
 rulefiles/linux/ignore.d.server/ntp |   13 -------------
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b70a77c..e9c10a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,8 @@ logcheck (1.3.4) experimental; urgency=low
   * logtail/logtail2 no longer ignore -o when called with only one argument
     (closes: #453309)
   * Deleting obsolete conffiles in logcheck-database.preinst
+    - ignore.d.server/lpr, replaced by lpr
+    - ignore.d.server/ntp, replaced by ntp
     - ignore.d.server/sendmail, also in sendmail-base (closes: #542265)
 
  -- Frédéric Brière <fbriere at fbriere.net>  Mon, 17 Aug 2009 11:48:08 -0400
diff --git a/debian/logcheck-database.preinst b/debian/logcheck-database.preinst
index 9f6fc2f..c3c8a18 100644
--- a/debian/logcheck-database.preinst
+++ b/debian/logcheck-database.preinst
@@ -22,6 +22,8 @@ set -e
 # add them to OLD_CONFFILES below, instead.
 
 REMOVED_CONFFILES="
+	/etc/logcheck/ignore.d.server/lpr
+	/etc/logcheck/ignore.d.server/ntp
 	/etc/logcheck/ignore.d.server/sendmail
 "
 
diff --git a/rulefiles/linux/ignore.d.server/lpr b/rulefiles/linux/ignore.d.server/lpr
deleted file mode 100644
index 6aa2411..0000000
--- a/rulefiles/linux/ignore.d.server/lpr
+++ /dev/null
@@ -1 +0,0 @@
-^\w{3} [ :0-9]{11} [\._[:alnum:]]+ lpd\[[0-9]+\]: restarted$
diff --git a/rulefiles/linux/ignore.d.server/ntp b/rulefiles/linux/ignore.d.server/ntp
deleted file mode 100644
index 21037ac..0000000
--- a/rulefiles/linux/ignore.d.server/ntp
+++ /dev/null
@@ -1,13 +0,0 @@
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: time reset [+-]*[0-9]{1,2}\.[0-9]{6} s$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: synchronisation lost$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: no servers reachable$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: synchronized to ([0-9.]{7,15}|[0-9a-fA-F:.]{4,39}), stratum [0-9]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: synchronized to LOCAL\([0-9]+\), stratum [0-9]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: kernel time sync (disabled|enabled|status change) [0-9]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: precision = [0-9]+\.[0-9]+ usec$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: peer ([.0-9]{7,15}|[0-9a-fA-F:.]{4,39}) now (in)?valid$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: adjusting local clock by -?[.0-9]+s$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: adjust time server -?[.0-9]+ offset$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: too many recvbufs allocated \([0-9]+\)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd\[[0-9]+\]: Listening on interface [-[:alnum:]]+, [:.[:xdigit:]]+#[[:digit:]]{1,5} (En|Dis)abled$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpd(_initres)?\[[0-9]+\]: signal_no_reset: signal [[:digit:]]+ had flags [[:xdigit:]]+$