[Logcheck-commits] CVS logcheck/debian

CVS User ttroxell logcheck-devel@lists.alioth.debian.org
Wed, 29 Dec 2004 23:46:39 -0700


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

Modified Files:
	logcheck.cron.d logcheck.postinst 
Log Message:
revert cron fix, policy violation


--- /cvsroot/logcheck/logcheck/debian/logcheck.cron.d	2004/12/28 08:43:15	1.4
+++ /cvsroot/logcheck/logcheck/debian/logcheck.cron.d	2004/12/30 06:46:38	1.5
@@ -3,7 +3,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 MAILTO=root
 
-##ENABLED_IN_POSTINST## @reboot         logcheck    if [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck -R; fi
-##ENABLED_IN_POSTINST## 2 * * * *       logcheck    if [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck; fi
+@reboot         logcheck    if [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck -R; fi
+2 * * * *       logcheck    if [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck; fi
 
 # EOF
--- /cvsroot/logcheck/logcheck/debian/logcheck.postinst	2004/12/28 08:43:15	1.25
+++ /cvsroot/logcheck/logcheck/debian/logcheck.postinst	2004/12/30 06:46:38	1.26
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: logcheck.postinst,v 1.25 2004/12/28 08:43:15 ttroxell Exp $
+# $Id: logcheck.postinst,v 1.26 2004/12/30 06:46:38 ttroxell Exp $
 
 set -e
 
@@ -69,13 +69,6 @@
           # just in case
           chown logcheck /var/lock/logcheck > /dev/null 2>&1 || true
 	fi
-	
-	# Uncomment cron job
-	# This procedure was set up to fix #284788
-	if grep -q '^##ENABLED_IN_POSTINST##' /etc/cron.d/logcheck; then
-	  sed 's/^##ENABLED_IN_POSTINST## //' logcheck.cron.d \
-	  > /etc/cron.d/logcheck
-	fi
 
 	;;