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 5dfd102..45acf85 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -73,11 +73,23 @@ class nagios::client inherits nagios {
                require => Package['dsa-nagios-checks'],
        }
        file { '/usr/local/sbin/dsa-check-libs':
-               source  => 'puppet:///modules/nagios/dsa-check-libs',
-               mode    => '0555',
+               ensure => absent,
        }
 
-       file { '/etc/cron.d/puppet-nagios-wraps':
-               content  => "47 * * * * root /usr/sbin/dsa-wrap-nagios-check -s puppet-agent /usr/lib/nagios/plugins/dsa-check_puppet_agent -d0 -c 28800 -w 18000\n",
+       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
        }
 }