Split header of puppet-nagios-wraps into own fragment, set orders

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

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index e4f8d90..45acf85 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -4,7 +4,8 @@ class nagios::client inherits nagios {
                ensure => purged
        }
        package { 'dsa-nagios-checks':
-               ensure => installed
+               ensure => installed,
+               tag    => extra_repo,
        }
 
        service { 'nagios-nrpe-server':
@@ -36,7 +37,8 @@ class nagios::client inherits nagios {
        }
        file { '/etc/nagios/':
                ensure  => directory,
-               recurse => true,
+               recurse => remote,
+               source  => 'puppet:///files/empty/',
                require => Package['nagios-nrpe-server'],
                notify  => Service['nagios-nrpe-server'],
        }
@@ -46,7 +48,8 @@ class nagios::client inherits nagios {
        }
        file { '/etc/nagios/nrpe.d':
                ensure  => directory,
-               recurse => true,
+               recurse => remote,
+               source  => 'puppet:///files/empty/',
                notify  => Service['nagios-nrpe-server'],
        }
        file { '/etc/nagios/nrpe.d/debianorg.cfg':
@@ -61,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
+       }
 }