From: Stephen Gran <steve@lobefin.net>
Date: Sun, 20 Sep 2009 11:31:30 +0000 (+0100)
Subject: get a few more file => package dependencies right
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8c81dab8b39a143712beb2479a41d5e2f303ddc9;p=mirror%2Fdsa-puppet.git

get a few more file => package dependencies right

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 19fbd6060..9e4483b2e 100644
--- 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 fca1fb23a..a49aec527 100644
--- 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 39a48ff39..5cdbc43be 100644
--- 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":