create /srv/static.debian.org/master static-masters

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

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 9ea7b33..45acf85 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,32 @@ 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':
+               ensure => absent,
+       }
 
+       concat { '/etc/cron.d/puppet-nagios-wraps': }
+       concat::fragment { 'puppet-nagios-wraps--header':
+               target => '/etc/cron.d/puppet-nagios-wraps',
+               order  => '000',
+               content  => @(EOF)
+                       SHELL=/bin/bash
+                       PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/nagios/plugins
+                       | EOF
+       }
+       concat::fragment { 'dsa-check_puppet_agent':
+               target => '/etc/cron.d/puppet-nagios-wraps',
+               order  => '010',
+               content  => @(EOF)
+                       47 * * * * root dsa-wrap-nagios-check -s puppet-agent dsa-check_puppet_agent -d0 -c 28800 -w 18000
+                       | EOF
+       }
 }