Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 19fbd60606b6231ebf01d0d00bb6bcce0c125f43..9e4483b2ea769fa4ed348822deb1b357658b5c45 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -68,17 +68,21 @@ class debian-org {
              source => "puppet:///files/etc/timezone",
              notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
       "/etc/puppet/puppet.conf":
+             require => Package["puppet"],
              source => "puppet:///files/etc/puppet/puppet.conf"
              ;
       "/etc/default/puppet":
+             require => Package["puppet"],
              source => "puppet:///files/etc/default/puppet"
              ;
 
       "/etc/syslog-ng/syslog-ng.conf":
              source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
+             require => Package["syslog-ng"],
              notify  => Exec["syslog-ng reload"],
              ;
       "/etc/logrotate.d/syslog-ng":
+             require => Package["syslog-ng"],
              source => "puppet:///files/etc/logrotate.d/syslog-ng",
              ;
       "/etc/cron.d/dsa-puppet-stuff":
@@ -86,9 +90,11 @@ class debian-org {
              require => Package["cron"]
              ;
       "/etc/ldap/ldap.conf":
+             require => Package["userdir-ldap"],
              source => "puppet:///files/etc/ldap/ldap.conf",
              ;
       "/etc/pam.d/common-session":
+             require => Package["libpam-pwdfile"],
              source => "puppet:///files/etc/pam.d/common-session",
              ;
    }

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index fca1fb23a4c4378be2bb11ba39efb55f4889d7e5..a49aec527b101dad251080b36c409e1df4d616db 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -20,6 +20,7 @@ class nagios::client inherits nagios {
                        notify  => Exec["nagios-nrpe-server restart"];
                "/etc/nagios/nrpe.d":
                        mode    => 755,
+                       require => Package["nagios-nrpe-server"],
                        ensure  => directory;
                "/etc/nagios/nrpe.d/debianorg.cfg":
                        source  => [ "puppet:///nagios/per-host/$fqdn/inc-debian.org",

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 39a48ff394a1f0c006f7d6139c787ad673c2e035..5cdbc43be8f111af0d63948034d3316600348b34 100644 (file)
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -23,6 +23,7 @@ class nagios::server inherits nagios::client {
 
                "/etc/nagios3/puppetconf.d":
                        mode    => 755,
+                       require => Package["nagios3"],
                        ensure  => directory;
 
                "/etc/nagios3/puppetconf.d/contacts.cfg":