massive style guide fixups

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

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index f73d8ad25fab7f3edfbef49bdd9dea32db669684..2ab72a84ae6812dcd40bb315a90c3da4ee9f1a86 100644 (file)
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -1,88 +1,75 @@
-class nagios::server inherits nagios::client {
-       package {
-               nagios3: ensure => installed;
-               nagios-nrpe-plugin: ensure => installed;
-               nagios-plugins: ensure => installed;
-               nagios-images: ensure => installed;
-       }
-
-       file {
-               "/etc/nagios-plugins/config/local-dsa-checkcommands.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/checkcommands.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios-plugins/config/local-dsa-eventhandlers.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/eventhandlers.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-
-               "/etc/nagios3/cgi.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/cgi.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/nagios.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/nagios.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
+class nagios::server {
 
-               "/etc/nagios3/puppetconf.d":
-                       mode    => 755,
-                       require => Package["nagios3"],
-                       ensure  => directory;
-
-               "/etc/nagios3/puppetconf.d/contacts.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/generic-host.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/generic-service.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/timeperiods.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-
-               "/etc/nagios3/puppetconf.d/auto-dependencies.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-hostgroups.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-hosts.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hosts.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-servicegroups.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-servicegroups.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-services.cfg":
-                       source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-services.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
+       package { [
+                       'nagios3',
+                       'nagios-nrpe-plugin',
+                       'nagios-plugins',
+                       'nagios-images'
+               ]
+               ensure => installed
+       }
 
+       service { 'nagios3':
+               ensure => running,
        }
 
-       exec { "nagios3 reload":
-               path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-               refreshonly => true,
+       file { '/etc/nagios-plugins/config':
+               ensure  => directory,
+               require => Package['nagios3'],
+               notify  => Service['nagios3'],
+       }
+       file { '/etc/nagios3':
+               ensure  => directory,
+               require => Package['nagios3'],
+               notify  => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d':
+               ensure => directory,
+               mode   => '0755',
+       }
+       file { '/etc/nagios-plugins/config/local-dsa-checkcommands.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/checkcommands.cfg',
+       }
+       file { '/etc/nagios-plugins/config/local-dsa-eventhandlers.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/eventhandlers.cfg',
+       }
+       file { '/etc/nagios3/cgi.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/cgi.cfg',
+       }
+       file { '/etc/nagios3/nagios.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/nagios.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/contacts.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/contacts.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/generic-host.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-host.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/generic-service.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-service.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/timeperiods.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/timeperiods.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-dependencies.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-dependencies.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hostextinfo.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-hostgroups.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hostgroups.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-hosts.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hosts.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-serviceextinfo.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-servicegroups.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-servicegroups.cfg',
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-services.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-services.cfg',
        }
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: