make dsa-check-libs +x

[dsa-puppet.git] / modules / nagios / manifests / client.pp

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 9ea7b33938f537f876a80ee0be8be9504eb643d5..2f4aede236936a58bee9313299f97cc94d73f55a 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -5,10 +5,7 @@ class nagios::client inherits nagios {
        }
        package { 'dsa-nagios-checks':
                ensure => installed,
-               require => [
-                       File['/etc/apt/sources.list.d/db.debian.org.list'],
-                       Exec['apt-get update']
-               ]
+               tag    => extra_repo,
        }
 
        service { 'nagios-nrpe-server':
@@ -67,9 +64,17 @@ class nagios::client inherits nagios {
                source  => 'puppet:///modules/nagios/common/obsolete-packages-ignore',
                require => Package['dsa-nagios-checks'],
        }
+       file { '/etc/nagios/check-libs.conf':
+               source  => 'puppet:///modules/nagios/common/check-libs.conf',
+               require => Package['dsa-nagios-checks'],
+       }
        file { '/etc/nagios/obsolete-packages-ignore.d/hostspecific':
                content => template('nagios/obsolete-packages-ignore.d-hostspecific.erb'),
                require => Package['dsa-nagios-checks'],
        }
+       file { '/usr/local/sbin/dsa-check-libs':
+               source  => 'puppet:///modules/nagios/dsa-check-libs',
+               mode    => '0555',
+       }
 
 }