From bab19af527a21d689324a95aa9a0134c9aadb863 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 23 Oct 2010 02:55:17 +0200 Subject: basic pnp4nagios grapher integration --- manifests/pnp4nagios.pp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 manifests/pnp4nagios.pp (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp new file mode 100644 index 0000000..051bad8 --- /dev/null +++ b/manifests/pnp4nagios.pp @@ -0,0 +1,17 @@ +class nagios::pnp4nagios { + include nagios::defaults::pnp4nagios + + package { [php5, php5-gd, rrdcollect, rrdtool, librrdp-perl, librrds-perl ]: + 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. + + file { 'pnp4nagios-templates.cfg': + path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ] + } +} -- cgit v1.2.3 From 3daee03641834a17818d323258f7b80179b7f0d6 Mon Sep 17 00:00:00 2001 From: nadir Date: Sat, 23 Oct 2010 16:28:19 +0200 Subject: possibility to deploy a custom pnp4nagios apache config --- manifests/pnp4nagios.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 051bad8..9fa4d63 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -14,4 +14,14 @@ class nagios::pnp4nagios { source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ] } + + file { 'apache.conf': + path => "/etc/pnp4nagios/apache.conf", + source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", + "puppet:///modules/nagios/configs/apache.conf" + ], + notify => Service['apache'], + } + + } -- cgit v1.2.3 From 4bd3595f84d6c8aa304a4048b3a082a82d911910 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 18:34:10 +0200 Subject: corrected path to pnp4nagios apache.conf --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 9fa4d63..3971f36 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -18,7 +18,7 @@ class nagios::pnp4nagios { file { 'apache.conf': path => "/etc/pnp4nagios/apache.conf", source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/configs/apache.conf" + "puppet:///modules/nagios/pnp4nagios/apache.conf" ], notify => Service['apache'], } -- cgit v1.2.3 From 64e2b42f925d263a11ff6b6b39a6c42511007ed1 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 18:52:22 +0200 Subject: package pnp4nagios available now, fix permissions for config files --- manifests/pnp4nagios.pp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 3971f36..9026d3e 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -1,7 +1,7 @@ class nagios::pnp4nagios { include nagios::defaults::pnp4nagios - package { [php5, php5-gd, rrdcollect, rrdtool, librrdp-perl, librrds-perl ]: + package { pnp4nagios: ensure => installed } @@ -12,14 +12,15 @@ class nagios::pnp4nagios { file { 'pnp4nagios-templates.cfg': path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ] + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], + mode => 0644, owner => root, group => root; } file { 'apache.conf': path => "/etc/pnp4nagios/apache.conf", source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/pnp4nagios/apache.conf" - ], + "puppet:///modules/nagios/pnp4nagios/apache.conf" ], + mode => 0644, owner => root, group => root; notify => Service['apache'], } -- cgit v1.2.3 From 09ea320fc19e872012d88fb748e2d784e360afa4 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:00:31 +0200 Subject: typo --- manifests/pnp4nagios.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 9026d3e..f0df1ff 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -20,8 +20,8 @@ class nagios::pnp4nagios { path => "/etc/pnp4nagios/apache.conf", source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", "puppet:///modules/nagios/pnp4nagios/apache.conf" ], - mode => 0644, owner => root, group => root; - notify => Service['apache'], + mode => 0644, owner => root, group => root, + notify => Service['apache']; } -- cgit v1.2.3 From c35d053d62ff363a53b797aca10e254bd4a405e2 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:41:20 +0200 Subject: configure pnp4nagios npcd --- manifests/pnp4nagios.pp | 65 +++++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 24 deletions(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index f0df1ff..6ab6986 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -1,28 +1,45 @@ class nagios::pnp4nagios { - include nagios::defaults::pnp4nagios - - package { pnp4nagios: - 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. - - file { 'pnp4nagios-templates.cfg': - path => "$nagios::nagios_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; - } - - file { 'apache.conf': - path => "/etc/pnp4nagios/apache.conf", - source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/pnp4nagios/apache.conf" ], - mode => 0644, owner => root, group => root, - notify => Service['apache']; - } + include nagios::defaults::pnp4nagios + package { pnp4nagios: + 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. + + file { 'pnp4nagios-templates.cfg': + path => "$nagios::nagios_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; + } + + file { 'apache.conf': + path => "/etc/pnp4nagios/apache.conf", + source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", + "puppet:///modules/nagios/pnp4nagios/apache.conf" ], + mode => 0644, owner => root, group => root, + notify => Service['apache']; + } + + # 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']; + } + + service { 'npcd': + ensure => running, + enable => true, + hasstatus => true, + require => Package['npcd'], + } + } -- cgit v1.2.3 From bb37870bc5cd38e0d7e5480c941aebe7dd9589de Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:49:01 +0200 Subject: depend on pnp4nagios instead of npcd --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 6ab6986..dd9b0c6 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -38,7 +38,7 @@ class nagios::pnp4nagios { ensure => running, enable => true, hasstatus => true, - require => Package['npcd'], + require => Package['pnp4nagios'], } -- cgit v1.2.3 From 11925952cbe29b25c776941a35ae921f43882359 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:54:14 +0200 Subject: fixed conf file permissions, notify services --- manifests/pnp4nagios.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index dd9b0c6..d97bb1e 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -14,6 +14,7 @@ class nagios::pnp4nagios { 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': -- cgit v1.2.3 From 6c60742df8e27c855352cfe4d5539c644d832e0c Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 20:10:33 +0200 Subject: typo --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index d97bb1e..837c447 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -13,7 +13,7 @@ class nagios::pnp4nagios { path => "$nagios::nagios_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; + mode => 0644, owner => root, group => root, notify => Service['nagios'], } -- cgit v1.2.3 From 54695b64c2ac83962a461cefd91c79c2fd5775ab Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 22:46:00 +0200 Subject: use a graph style icon for action.gif --- manifests/pnp4nagios.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 837c447..1eb2bf7 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -42,5 +42,15 @@ class nagios::pnp4nagios { 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']; + } + } -- cgit v1.2.3 From 139e8fd42661848da4765b8c4f65fe85a54a2d9f Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 18 Sep 2012 10:22:09 +0200 Subject: require pnp4nagios package for config file --- manifests/pnp4nagios.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 1eb2bf7..0f86d2a 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -22,7 +22,8 @@ class nagios::pnp4nagios { source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", "puppet:///modules/nagios/pnp4nagios/apache.conf" ], mode => 0644, owner => root, group => root, - notify => Service['apache']; + notify => Service['apache'], + require => Package['pnp4nagios'], } # run npcd as daemon -- cgit v1.2.3 From 1c2981ae2f82b80d49fcc9349a959f1152b6b9ab Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 25 Sep 2012 21:29:31 +0200 Subject: fix proper deployment of pnp4nagios-templates.cfg --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 0f86d2a..efa8681 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -10,7 +10,7 @@ class nagios::pnp4nagios { # so we need to copy a file here. file { 'pnp4nagios-templates.cfg': - path => "$nagios::nagios_cfgdir/conf.d/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, -- cgit v1.2.3 From c1ef04bf0bd3dad921c27a0d8ad3c7f6e06977fa Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 25 Sep 2012 23:47:42 +0200 Subject: forgot $ --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index efa8681..7c960a7 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -10,7 +10,7 @@ class nagios::pnp4nagios { # so we need to copy a file here. file { 'pnp4nagios-templates.cfg': - path => "{nagios::defaults::vars::int_cfgdir}/conf.d/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, -- cgit v1.2.3 From e72f4b51dbc9f183d60251de44e80149d88a1da3 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 14 Feb 2013 18:47:26 -0500 Subject: lintian of pnp4nagios commits --- manifests/pnp4nagios.pp | 68 +++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 31 deletions(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 7c960a7..e7d2be1 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -1,57 +1,63 @@ class nagios::pnp4nagios { include nagios::defaults::pnp4nagios - package { pnp4nagios: + package { 'pnp4nagios': 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 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. 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'], + 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'], } - + file { 'apache.conf': - path => "/etc/pnp4nagios/apache.conf", - source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/pnp4nagios/apache.conf" ], - mode => 0644, owner => root, group => root, - notify => Service['apache'], + path => '/etc/pnp4nagios/apache.conf', + source => [ 'puppet:///modules/site-nagios/pnp4nagios/apache.conf', + 'puppet:///modules/nagios/pnp4nagios/apache.conf' ], + mode => '0644', + owner => root, + group => root, + notify => Service['apache'], require => Package['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, + 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, + 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']; } - - } -- cgit v1.2.3 From 2bf3d8f17fae838982fcfa7a7c9e1833e65aec18 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 14 Feb 2013 18:50:00 -0500 Subject: make site_nagios source primary, but allow fall-back to site-nagios --- manifests/pnp4nagios.pp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index e7d2be1..d8ee85e 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -11,7 +11,8 @@ class nagios::pnp4nagios { file { 'pnp4nagios-templates.cfg': path => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", - source => [ 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-templates.cfg', + 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg', 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ], mode => '0644', owner => root, @@ -21,7 +22,8 @@ class nagios::pnp4nagios { file { 'apache.conf': path => '/etc/pnp4nagios/apache.conf', - source => [ 'puppet:///modules/site-nagios/pnp4nagios/apache.conf', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/apache.conf', + 'puppet:///modules/site-nagios/pnp4nagios/apache.conf', 'puppet:///modules/nagios/pnp4nagios/apache.conf' ], mode => '0644', owner => root, @@ -34,7 +36,8 @@ class nagios::pnp4nagios { file { '/etc/default/npcd': path => '/etc/default/npcd', - source => [ 'puppet:///modules/site-nagios/pnp4nagios/npcd', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/npcd', + 'puppet:///modules/site-nagios/pnp4nagios/npcd', 'puppet:///modules/nagios/pnp4nagios/npcd' ], mode => '0644', owner => root, @@ -53,7 +56,8 @@ class nagios::pnp4nagios { file { '/usr/share/nagios3/htdocs/images/action.gif': path => '/usr/share/nagios3/htdocs/images/action.gif', - source => [ 'puppet:///modules/site-nagios/pnp4nagios/action.gif', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/action.gif', + 'puppet:///modules/site-nagios/pnp4nagios/action.gif', 'puppet:///modules/nagios/pnp4nagios/action.gif' ], mode => '0644', owner => root, -- cgit v1.2.3 From 4cc87a364640b8c15b16fcddf1ffdc75b0dfa649 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 22 Feb 2013 16:12:20 -0500 Subject: remove site-nagios source lines, we decided that it is better not to carry that old baggage around --- manifests/pnp4nagios.pp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index d8ee85e..0c920eb 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -12,7 +12,6 @@ class nagios::pnp4nagios { 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/site-nagios/pnp4nagios/pnp4nagios-templates.cfg', 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ], mode => '0644', owner => root, @@ -23,7 +22,6 @@ class nagios::pnp4nagios { file { 'apache.conf': path => '/etc/pnp4nagios/apache.conf', source => [ 'puppet:///modules/site_nagios/pnp4nagios/apache.conf', - 'puppet:///modules/site-nagios/pnp4nagios/apache.conf', 'puppet:///modules/nagios/pnp4nagios/apache.conf' ], mode => '0644', owner => root, @@ -37,7 +35,6 @@ class nagios::pnp4nagios { file { '/etc/default/npcd': path => '/etc/default/npcd', source => [ 'puppet:///modules/site_nagios/pnp4nagios/npcd', - 'puppet:///modules/site-nagios/pnp4nagios/npcd', 'puppet:///modules/nagios/pnp4nagios/npcd' ], mode => '0644', owner => root, @@ -57,7 +54,6 @@ class nagios::pnp4nagios { 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/site-nagios/pnp4nagios/action.gif', 'puppet:///modules/nagios/pnp4nagios/action.gif' ], mode => '0644', owner => root, -- cgit v1.2.3 From cfb91ce97243e743f5af0c417851aa730ab96f41 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 27 Feb 2013 19:47:14 +0100 Subject: delete commented nagios_host and -service template definitions --- manifests/pnp4nagios.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/pnp4nagios.pp') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 0c920eb..5ade74f 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -5,9 +5,9 @@ class nagios::pnp4nagios { 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", -- cgit v1.2.3