massive style guide fixups

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

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 33808c45a44752d7567102aab65768c108143c89..b72f002b1774953cae344719f6618e2fe0d84338 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -1,81 +1,64 @@
 class nagios::client inherits nagios {
-    package {
-        dsa-nagios-nrpe-config: ensure => purged;
-        dsa-nagios-checks: ensure => installed;
-    }
 
-    file {
-        "/etc/default/nagios-nrpe-server":
-            source  => [ "puppet:///modules/nagios/per-host/$fqdn/default",
-                         "puppet:///modules/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":
-            content => template("nagios/nrpe.cfg.erb"),
-            require => Package["nagios-nrpe-server"],
-            notify  => Exec["service nagios-nrpe-server reload"],
-            ;
-        "/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["service nagios-nrpe-server reload"],
-            ;
-        "/etc/nagios/nrpe.d/nrpe_dsa.cfg":
-            source  => [ "puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
-            require => Package["dsa-nagios-checks"],
-            notify  => Exec["service nagios-nrpe-server reload"],
-            ;
+       package { 'dsa-nagios-nrpe-config':
+               ensure => purged
+       }
+       package { 'dsa-nagios-checks':
+               ensure => installed
+       }
 
-        "/etc/nagios/obsolete-packages-ignore":
-            source  => [ "puppet:///modules/nagios/per-host/$fqdn/obsolete-packages-ignore",
-                         "puppet:///modules/nagios/common/obsolete-packages-ignore" ],
-            require => Package["dsa-nagios-checks"],
-            ;
+       service { 'nagios-nrpe-server':
+               ensure    => running,
+               hasstatus => false,
+               pattern   => 'nrpe',
+       }
 
-        "/etc/nagios/obsolete-packages-ignore.d/hostspecific":
-                        content => template("nagios/obsolete-packages-ignore.d-hostspecific.erb"),
-            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,
+       }
 
-    exec {
-        "nagios-nrpe-server restart":
-            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-            refreshonly => true,
-            ;
-        "service nagios-nrpe-server reload":
-# remove after lenny EOL (lenny has no service binary)
-# -cut-
-            command    => "/etc/init.d/nagios-nrpe-server reload",
-# -cut-
-            refreshonly => true,
-            ;
-    }
+       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,
+               require => Package['nagios-nrpe-server'],
+               notify  => Service['nagios-nrpe-server'],
+       }
+       file { '/etc/nagios/nrpe.cfg':
+               content => template('nagios/nrpe.cfg.erb'),
+       }
+       file { '/etc/nagios/nrpe.d':
+               ensure  => directory,
+               mode    => '0755',
+       }
+       file { '/etc/nagios/nrpe.d/debianorg.cfg':
+               content => template('nagios/inc-debian.org.erb'),
+       }
+       file { '/etc/nagios/nrpe.d/nrpe_dsa.cfg':
+               source  => 'puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg',
+       }
+       file { '/etc/nagios/obsolete-packages-ignore':
+               source  => 'puppet:///modules/nagios/common/obsolete-packages-ignore',
+               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'],
+       }
 
-    @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,
-            ;
-        "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,
-            ;
-    }
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: