[Logcheck-commits] CVS logcheck/debian

[CVS User ttroxell]

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

Modified Files:
	changelog logcheck.cron.d logcheck.postinst 
Log Message:
set up crontab enabler in postinst, comment out cron jobs in existing file


--- /cvsroot/logcheck/logcheck/debian/changelog	2004/12/21 16:18:44	1.312
+++ /cvsroot/logcheck/logcheck/debian/changelog	2004/12/28 08:43:14	1.313
@@ -10,6 +10,9 @@
   * Add rule for weekly nmbd logrotate. (closes: #286329)
   todd:
   * Set rule directories setgid to simplify administration. (closes: #286230)
+  * Add future package plans to TODO
+  * Remove dh_strip and dh_shlibdeps from debian/rules
+  * Set up postinst based post-adduser crontab de-commenter (closes: #284788)
 
  -- 
 
--- /cvsroot/logcheck/logcheck/debian/logcheck.cron.d	2004/06/05 08:24:56	1.3
+++ /cvsroot/logcheck/logcheck/debian/logcheck.cron.d	2004/12/28 08:43:15	1.4
@@ -3,7 +3,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 MAILTO=root
 
-@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
+##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
 
 # EOF
--- /cvsroot/logcheck/logcheck/debian/logcheck.postinst	2004/12/20 22:47:07	1.24
+++ /cvsroot/logcheck/logcheck/debian/logcheck.postinst	2004/12/28 08:43:15	1.25
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: logcheck.postinst,v 1.24 2004/12/20 22:47:07 ttroxell Exp $
+# $Id: logcheck.postinst,v 1.25 2004/12/28 08:43:15 ttroxell Exp $
 
 set -e
 
@@ -69,6 +69,13 @@
           # 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
 
 	;;