[project @ peter@palfrader.org-20080706092810-469h8dizgat025n2]

Move script calls from cron.daily to cron.d @daily and @reboot

diff --git a/dsa-nagios-nrpe-config/debian/changelog b/dsa-nagios-nrpe-config/debian/changelog
index a582cbf..53713a9 100644 (file)
--- a/dsa-nagios-nrpe-config/debian/changelog
+++ b/dsa-nagios-nrpe-config/debian/changelog
@@ -1,8 +1,9 @@
 dsa-nagios-nrpe-config (XX) unstable; urgency=low
 
-  * Move apt status update from cron.daily to usr/sbin/dsa-update-apt-status
+  * Move apt status update from cron.daily to usr/sbin/dsa-update-apt-status.
+  * Move script calls from cron.daily to cron.d @daily and @reboot.
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 06 Jul 2008 11:23:44 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sun, 06 Jul 2008 11:27:36 +0200
 
 dsa-nagios-nrpe-config (45) unstable; urgency=low
 

diff --git a/dsa-nagios-nrpe-config/debian/cron.d b/dsa-nagios-nrpe-config/debian/cron.d
new file mode 100644 (file)
index 0000000..389874f
--- /dev/null
+++ b/dsa-nagios-nrpe-config/debian/cron.d
@@ -0,0 +1,7 @@
+@reboot  root sleep 10m && [ -x /usr/share/dsa/weak-ssh-keys-check ] && /usr/share/dsa/weak-ssh-keys-check -s /var/cache/dsa/nagios/weak-ssh-keys
+@daily   root              [ -x /usr/share/dsa/weak-ssh-keys-check ] && /usr/share/dsa/weak-ssh-keys-check -s /var/cache/dsa/nagios/weak-ssh-keys
+
+@reboot  root sleep 15m && [ -x /usr/sbin/dsa-update-apt-status ] && /usr/sbin/dsa-update-apt-status
+@daily   root              [ -x /usr/sbin/dsa-update-apt-status ] && /usr/sbin/dsa-update-apt-status
+
+# vim:ft=crontab:

diff --git a/dsa-nagios-nrpe-config/debian/cron.daily b/dsa-nagios-nrpe-config/debian/cron.daily
deleted file mode 100644 (file)
index 09b9631..0000000
--- a/dsa-nagios-nrpe-config/debian/cron.daily
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-[ -x /usr/share/dsa/weak-ssh-keys-check ] && /usr/share/dsa/weak-ssh-keys-check -s /var/cache/dsa/nagios/weak-ssh-keys
-
-[ -x /usr/sbin/dsa-update-apt-status ] && /usr/sbin/dsa-update-apt-status &