diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-22 16:12:20 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-22 16:12:20 -0500 |
| commit | 4cc87a364640b8c15b16fcddf1ffdc75b0dfa649 (patch) | |
| tree | d641347d50846e3f6c72a9dfd9343d9f4d65e206 | |
| parent | 27052f33d329118e116d5ce1cffb994ff18d773c (diff) | |
remove site-nagios source lines, we decided that it is better not to carry that old baggage around
| -rw-r--r-- | manifests/pnp4nagios.pp | 4 | ||||
| -rw-r--r-- | manifests/pnp4nagios/popup.pp | 2 |
2 files changed, 0 insertions, 6 deletions
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, diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index b90f163..0dc04b0 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,7 +1,6 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', - 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg' ], } @@ -11,7 +10,6 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { file { 'status-header.ssi': path => '/usr/share/nagios3/htdocs/ssi/status-header.ssi', source => [ 'puppet:///modules/site_nagios/pnp4nagios/status-header.ssi', - 'puppet:///modules/site-nagios/pnp4nagios/status-header.ssi', 'puppet:///modules/nagios/pnp4nagios/status-header.ssi' ], mode => '0644', owner => root, |