Decommission fano and finzi

[mirror/dsa-puppet.git] / modules / debian_org / templates / dsa-puppet-stuff.cron.erb

diff --git a/modules/debian_org/templates/dsa-puppet-stuff.cron.erb b/modules/debian_org/templates/dsa-puppet-stuff.cron.erb
index 73679cf..9d339c5 100644 (file)
--- a/modules/debian_org/templates/dsa-puppet-stuff.cron.erb
+++ b/modules/debian_org/templates/dsa-puppet-stuff.cron.erb
@@ -1,4 +1,6 @@
 
+@hourly  root [ ! -d /var/cache/dsa ] || touch /var/cache/dsa/cron.alive
+
 <% if scope.call_function('versioncmp', [@puppetversion.to_s, '3.0.0']) <= 0 -%>
 34 */4 * * * root if [ -x /usr/sbin/puppetd ]; then sleep $(( $RANDOM \% 7200 )); if [ -x /usr/bin/timeout ]; then TO="timeout --kill-after=900 3600"; else TO=""; fi; tmp="$(tempfile)"; egrep -v '^(#|$)' /etc/dsa/cron.ignore.dsa-puppet-stuff > "$tmp" && $TO /usr/sbin/puppetd -o --no-daemonize 2>&1 | egrep --text -v -f "$tmp"; rm -f "$tmp"; fi
 <% else -%>
@@ -12,3 +14,8 @@
 @daily root [ -d /var/lib/puppet/clientbucket ] && find /var/lib/puppet/clientbucket -type f -mtime +60 -delete && find /var/lib/puppet/clientbucket -type d -empty -delete
 
 @hourly root ! [ -x /usr/local/sbin/ntp-restart-if-required ] || /usr/local/sbin/ntp-restart-if-required
+
+# Nagios related entries
+@hourly root [ -x /usr/sbin/dsa-update-apt-status ] && sleep $(( $RANDOM \% 1800 )) && /usr/sbin/dsa-update-apt-status 2>&1 | logger -t dsa-update-apt-status
+13 */4 * * * root [ -x /usr/sbin/dsa-update-samhain-status ] && sleep $(( $RANDOM \% 10800 )) && /usr/sbin/dsa-update-samhain-status
+40 12 25 * *   root [ -x /usr/sbin/dsa-update-unowned-file-status ] && sleep $(( $RANDOM \% 86400 )) && /usr/sbin/dsa-update-unowned-file-status