whitespace/quoting: modules/nagiosmanifests/ (make lint happy)

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

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 85c471f..710378c 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -1,57 +1,86 @@
 class nagios::client inherits nagios {
-       package {
-               dsa-nagios-nrpe-config: ensure => purged;
-               dsa-nagios-checks: ensure => installed;
-       }
+  package { 'dsa-nagios-nrpe-config':
+    ensure => purged
+  }
+  package { 'dsa-nagios-checks':
+    ensure => installed,
+    tag    => extra_repo,
+  }
 
-       file {
-               "/etc/default/nagios-nrpe-server":
-                       source  => [ "puppet:///nagios/per-host/$fqdn/default",
-                                    "puppet:///nagios/common/default" ],
-                       require => Package["nagios-nrpe-server"],
-                       notify  => Exec["nagios-nrpe-server restart"];
-               "/etc/default/nagios-nrpe":
-                       ensure  => absent,
-                       notify  => Exec["nagios-nrpe-server restart"];
-               "/etc/nagios/nrpe.cfg":
-                       source  => [ "puppet:///nagios/per-host/$fqdn/nrpe.cfg",
-                                    "puppet:///nagios/common/nrpe.cfg" ],
-                       require => Package["nagios-nrpe-server"],
-                       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":
-                        content => template("nagios/inc-debian.org.erb"),
-                       require => Package["nagios-nrpe-server"],
-                       notify  => Exec["nagios-nrpe-server restart"];
-               "/etc/nagios/nrpe.d/nrpe_dsa.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
-                       require => Package["dsa-nagios-checks"],
-                       notify  => Exec["nagios-nrpe-server restart"];
+  service { 'nagios-nrpe-server':
+    ensure    => running,
+    hasstatus => false,
+    pattern   => 'nrpe',
+  }
 
-               "/etc/nagios/obsolete-packages-ignore":
-                       source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore",
-                                    "puppet:///nagios/common/obsolete-packages-ignore" ],
-                       require => Package["dsa-nagios-checks"];
+  ferm::rule { 'dsa-nagios-v4':
+    description => 'Allow nrpe from nagios master',
+    rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V4) ACCEPT; }',
+    notarule    => true,
+  }
+  ferm::rule { 'dsa-nagios-v6':
+    description => 'Allow nrpe from nagios master',
+    domain      => 'ip6',
+    rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V6) ACCEPT; }',
+    notarule    => true,
+  }
 
-               "/etc/nagios/obsolete-packages-ignore.d/hostspecific":
-                        content => template("nagios/obsolete-packages-ignore.d-hostspecific.erb"),
-                       require => Package["dsa-nagios-checks"];
-       }
+  file { '/etc/default/nagios-nrpe-server':
+    source  => 'puppet:///modules/nagios/common/default',
+    require => Package['nagios-nrpe-server'],
+    notify  => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/default/nagios-nrpe':
+    ensure => absent,
+    notify => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/nagios/':
+    ensure  => directory,
+    recurse => remote,
+    source  => 'puppet:///files/empty/',
+    require => Package['nagios-nrpe-server'],
+    notify  => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/nagios/nrpe.cfg':
+    content => template('nagios/nrpe.cfg.erb'),
+    notify  => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/nagios/nrpe.d':
+    ensure  => directory,
+    recurse => remote,
+    source  => 'puppet:///files/empty/',
+    notify  => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/nagios/nrpe.d/debianorg.cfg':
+    content => template('nagios/inc-debian.org.erb'),
+    notify  => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/nagios/nrpe.d/nrpe_dsa.cfg':
+    source => 'puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg',
+    notify => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/nagios/obsolete-packages-ignore':
+    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,
+  }
 
-       exec { "nagios-nrpe-server restart":
-               path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-               refreshonly => true,
-       }
-        @ferm::rule { "dsa-nagios-v4":
-                description     => "Allow nrpe from nagios master",
-                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V4) ACCEPT; }"
-        }
-        @ferm::rule { "dsa-nagios-v6":
-                description     => "Allow nrpe from nagios master",
-                domain          => "ip6",
-                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS_V6) ACCEPT; }"
-        }
+  file { '/etc/cron.d/puppet-nagios-wraps': ensure => absent, }
+  concat::fragment { 'puppet-crontab--nagios--dsa-check-puppet-agent':
+    target  => '/etc/cron.d/puppet-crontab',
+    order   => '010',
+    content => @(EOF)
+      47 * * * * root dsa-wrap-nagios-check -s puppet-agent dsa-check-puppet_agent -d0 -c 28800 -w 18000
+      | EOF
+  }
 }