[Logcheck-commits] CVS logcheck/debian

[CVS User eevans-guest]

Update of /cvsroot/logcheck/logcheck/debian
In directory haydn:/tmp/cvs-serv23429

Modified Files:
	README.debian changelog logcheck.config logcheck.postinst 
	logcheck.templates 
Log Message:
- Removed debconf dialog for configuring crontab.
- Added a note to README.Debian indicating how to manually change the 
  interval of the cronjob.

-- Eric Evans


--- /cvsroot/logcheck/logcheck/debian/README.debian	2004/04/19 18:22:04	1.1.1.1
+++ /cvsroot/logcheck/logcheck/debian/README.debian	2004/05/24 01:28:22	1.2
@@ -21,4 +21,7 @@
 
 The documentation is being updated as time allows.
 
+By default logcheck is set to run once an hour. This can be changed by
+editing /etc/cron.d/logcheck.
+
 -- Jon Middleton <jjm@debian.org>
--- /cvsroot/logcheck/logcheck/debian/changelog	2004/05/22 22:06:03	1.87
+++ /cvsroot/logcheck/logcheck/debian/changelog	2004/05/24 01:28:22	1.88
@@ -26,8 +26,6 @@
   * Made addition of logcheck user and permissions/ownership changes a
     conditional of an upgrade from a version less than 1.2.19,
     (Closes: #249324).
-  * Prompt with debconf, (priority low), for the frequency to run 
-    logcheck, (Closes: #222240, #226937). 
   alfie:
   * src/logcheck: test also for readability for the header.txt and footer.txt.
   * debian/changelog: stripped all trailing whitespace from the file.
--- /cvsroot/logcheck/logcheck/debian/logcheck.config	2004/05/18 19:52:39	1.6
+++ /cvsroot/logcheck/logcheck/debian/logcheck.config	2004/05/24 01:28:22	1.7
@@ -16,8 +16,6 @@
     db_text medium logcheck/changes || true
 fi
 
-db_input low logcheck/cron || true
-
 db_go || true
 
 exit 0
--- /cvsroot/logcheck/logcheck/debian/logcheck.postinst	2004/05/19 15:06:55	1.13
+++ /cvsroot/logcheck/logcheck/debian/logcheck.postinst	2004/05/24 01:28:22	1.14
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: logcheck.postinst,v 1.13 2004/05/19 15:06:55 eevans-guest Exp $
+# $Id: logcheck.postinst,v 1.14 2004/05/24 01:28:22 eevans-guest Exp $
 
 set -e
 
@@ -25,26 +25,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-# Update the logcheck crontab to one of the alternate intervals
-update_crontab()
-{
-    CRONTAB=/etc/cron.d/logcheck
-    TMPCRON=`mktemp /var/tmp/logcheck-cron.XXXXXX`
-    
-    if [ -f $CRONTAB ] && [ "$1" == "daily" ] ; then
-        sed -e "s/^[[:digit:]*,-/]\+[[:space:]]\+[[:digit:]*,-/]\+[[:space:]]\+[[:digit:]*,-/]\+[[:space:]]\+[[:alnum:]*,-/]\+[[:space:]]\+[[:alnum:]*,-/]\+\([[:space:]]\+.\+ \/usr\/sbin\/logcheck .\+$\)/2 0 * * *\1/g" $CRONTAB > $TMPCRON
-	cp $TMPCRON $CRONTAB
-	chmod 644 $CRONTAB
-    fi
-    
-    if [ -f $CRONTAB ] && [ "$1" == "weekly" ] ; then
-        sed -e "s/^[[:digit:]*,-/]\+[[:space:]]\+[[:digit:]*,-/]\+[[:space:]]\+[[:digit:]*,-/]\+[[:space:]]\+[[:alnum:]*,-/]\+[[:space:]]\+[[:alnum:]*,-/]\+\([[:space:]]\+.\+ \/usr\/sbin\/logcheck .\+$\)/2 0 1 * *\1/g" $CRONTAB > $TMPCRON
-	cp $TMPCRON $CRONTAB
-	chmod 644 $CRONTAB
-    fi
-    rm -f $TMPCRON
-}
-
 case "$1" in
     configure)
 	# Remove old directory's
@@ -77,16 +57,6 @@
           chown logcheck /var/lock/logcheck &> /dev/null || true
 	fi
 
-	db_get logcheck/cron
-	CRON="$RET"
-	case "$RET" in
-	    daily)
-	        update_crontab daily
-            ;;
-	    weekly)
-	        update_crontab weekly
-	    ;;

[4 lines skipped]
--- /cvsroot/logcheck/logcheck/debian/logcheck.templates	2004/05/19 15:06:56	1.8
+++ /cvsroot/logcheck/logcheck/debian/logcheck.templates	2004/05/24 01:28:22	1.9
@@ -20,12 +20,3 @@
  directories.
  .
  Please see /usr/share/doc/logcheck for more details.
-
-Template: logcheck/cron
-Type: select
-Choices: weekly, daily, hourly
-Default: hourly
-_Description: How often should logcheck run to generate reports?
- Logcheck is invoked by cron to periodically parse your log files and 
- generate an email report. Hourly is the default and recommended 
- interval for, but you may also select from one of weekly or daily.