1 files changed, 33 insertions, 41 deletions

diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp
index 230772f..a7e1c73 100644
--- a/manifests/pnp4nagios.pp
+++ b/manifests/pnp4nagios.pp
@@ -1,33 +1,29 @@
+# manage pnp4nagios
 class nagios::pnp4nagios {
   include nagios::defaults::pnp4nagios
 
-  package { 'pnp4nagios':
-    ensure  => installed,
-    require => Package['nagios']
-  }
+  package { [ 'pnp4nagios', 'pnp4nagios-web-config-nagios3']:
+    ensure => installed }
 
 
-  # unfortunatly i didn't find a way to use nagios_host and nagios_service definition, because
-  # imho puppet can't handle the "name" variable needed in these 2 definitions
-  # so we need to copy a file here.
+  # unfortunatly we can't use the nagios_host and nagios_service
+  # definition to define templates, so we need to copy a file here.
+  # see http://projects.reductivelabs.com/issues/1180 for this limitation
 
   file { 'pnp4nagios-templates.cfg':
-    path    => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg",
-    source  => [
-      'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg',
-      'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ],
-    mode    => '0644',
-    owner   => root,
-    group   => root,
-    notify  => Service['nagios'],
-    require => Package['pnp4nagios'],
+    path   => "${nagios::defaults::vars::int_cfgdir}/pnp4nagios-templates.cfg",
+    source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-templates.cfg',
+                'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ],
+    mode   => '0644',
+    owner  => root,
+    group  => root,
+    notify => Service['nagios'],
   }
 
   file { 'apache.conf':
     path    => '/etc/pnp4nagios/apache.conf',
-    source  => [
-      'puppet:///modules/site-nagios/pnp4nagios/apache.conf',
-      'puppet:///modules/nagios/pnp4nagios/apache.conf' ],
+    source  => ['puppet:///modules/site_nagios/pnp4nagios/apache.conf',
+                'puppet:///modules/nagios/pnp4nagios/apache.conf' ],
     mode    => '0644',
     owner   => root,
     group   => root,
@@ -38,35 +34,31 @@ class nagios::pnp4nagios {
   # run npcd as daemon
 
   file { '/etc/default/npcd':
-    path    => '/etc/default/npcd',
-    source  => [
-      'puppet:///modules/site-nagios/pnp4nagios/npcd',
-      'puppet:///modules/nagios/pnp4nagios/npcd' ],
-    mode    => '0644',
-    owner   => root,
-    group   => root,
-    notify  => Service['npcd'],
-    require => Package['pnp4nagios'],
+    path   => '/etc/default/npcd',
+    source => [ 'puppet:///modules/site_nagios/pnp4nagios/npcd',
+                'puppet:///modules/nagios/pnp4nagios/npcd' ],
+    mode   => '0644',
+    owner  => root,
+    group  => root,
+    notify => Service['npcd'];
   }
 
   service { 'npcd':
-    ensure    => running,
-    enable    => true,
-    hasstatus => true,
-    require   => Package['pnp4nagios'],
+      ensure    => running,
+      enable    => true,
+      hasstatus => true,
+      require   => Package['pnp4nagios'],
   }
 
   # modify action.gif
 
   file { '/usr/share/nagios3/htdocs/images/action.gif':
-    path    => '/usr/share/nagios3/htdocs/images/action.gif',
-    source  => [
-      'puppet:///modules/site-nagios/pnp4nagios/action.gif',
-      'puppet:///modules/nagios/pnp4nagios/action.gif' ],
-    mode    => '0644',
-    owner   => root,
-    group   => root,
-    notify  => Service['nagios'],
-    require => Package['pnp4nagios'],
+    path   => '/usr/share/nagios3/htdocs/images/action.gif',
+    source => [ 'puppet:///modules/site_nagios/pnp4nagios/action.gif',
+                'puppet:///modules/nagios/pnp4nagios/action.gif' ],
+    mode   => '0644',
+    owner  => root,
+    group  => root,
+    notify => Service['nagios'];
   }
 }