Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...

diff --git a/files/etc/cron.d/dsa-puppet-stuff b/files/etc/cron.d/dsa-puppet-stuff
index 0d16c2c..3750093 100644 (file)
--- a/files/etc/cron.d/dsa-puppet-stuff
+++ b/files/etc/cron.d/dsa-puppet-stuff
@@ -1 +1,3 @@
+SHELL=/bin/bash
 @hourly  root [ ! -d /var/cache/dsa ] || touch /var/cache/dsa/cron.alive
+34 */4 * * * root [ ! -x /usr/sbin/puppetd ] || ( sleep $(( $RANDOM \% 3600 )) && /usr/sbin/puppetd -w 5 --factsync -t )

diff --git a/files/etc/default/puppet b/files/etc/default/puppet
index de30d99..86ab4b9 100644 (file)
--- a/files/etc/default/puppet
+++ b/files/etc/default/puppet
@@ -6,7 +6,7 @@
 # Defaults for puppet - sourced by /etc/init.d/puppet
 
 # Start puppet on boot?
-START=yes
+START=no
 
 # Startup options
 DAEMON_OPTS="-w 5 --factsync"

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 3367257..37c98fb 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -54,7 +54,7 @@ class debian-org {
              notify  => Exec["puppet reload"];
       "/etc/default/puppet":
              source => "puppet:///files/etc/default/puppet",
-             notify  => Exec["puppet restart"];
+             require => Exec["puppet stop"];
 
       "/etc/syslog-ng/syslog-ng.conf":
              source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
@@ -95,7 +95,7 @@ class debian-org {
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
-   exec { "puppet restart":
+   exec { "puppet stop":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }

diff --git a/modules/monit/files/puppet b/modules/monit/files/puppet
index d1f5085..b08ec0c 100644 (file)
--- a/modules/monit/files/puppet
+++ b/modules/monit/files/puppet
@@ -2,17 +2,6 @@
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
-check process puppetd with pidfile /var/run/puppet/puppetd.pid
-    start program = "/etc/init.d/puppet start"
-    stop program  = "/etc/init.d/puppet stop"
-    if cpu is greater than 80% for 3 cycles then alert
-    if cpu > 60% for 5 cycles then restart
-    if 5 restarts within 5 cycles then timeout
-
-check file puppetstate
-    with path /var/lib/puppet/state/state.yaml
-    if timestamp > 90 minutes for 9 cycles then exec "/etc/init.d/puppet stop"
-    depends on puppetd
 
 check file cronalive
     with path /var/cache/dsa/cron.alive

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 0b1377d..fab0290 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -111,6 +111,14 @@ file=/etc/bind/geodns/db.security.debian.org.AS
 file=/etc/bind/geodns/db.security.debian.org.AN
 file=/etc/bind/geodns/db.security.debian.org.AF
 file=/etc/bind/geodns/db.security.debian.org
+file=/etc/bind/geodns/db.video.debconf.debian.org.EU
+file=/etc/bind/geodns/db.video.debconf.debian.org.AF
+file=/etc/bind/geodns/db.video.debconf.debian.org.OC
+file=/etc/bind/geodns/db.video.debconf.debian.org.SA
+file=/etc/bind/geodns/db.video.debconf.debian.org.AS
+file=/etc/bind/geodns/db.video.debconf.debian.org.NA
+file=/etc/bind/geodns/db.video.debconf.debian.org.AN
+file=/etc/bind/geodns/db.video.debconf.debian.org
 <% end -%>