Merge remote-tracking branch 'shared/master'

1 files changed, 5 insertions, 21 deletions

diff --git a/manifests/apache.pp b/manifests/apache.pp
index a90d0ee..8da9c11 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -1,29 +1,13 @@
+# setup naguis together with apache
 class nagios::apache(
   $allow_external_cmd = false,
   $manage_shorewall = false,
   $manage_munin = false
 ) {
-  class{'nagios':
-    httpd => 'apache',
+  class{'::nagios':
+    httpd              => 'apache',
     allow_external_cmd => $allow_external_cmd,
-    manage_munin => $manage_munin,
-    manage_shorewall => $manage_shorewall,
-  }
-
-  case $::operatingsystem {
-    'debian': {
-      file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf":
-        ensure => present,
-        source => [ "puppet:///site_nagios/configs/${::fqdn}/apache2.conf",
-                    "puppet:///site_nagios/configs/apache2.conf",
-                    "puppet:///nagios/configs/apache2.conf"],
-      }
-
-      apache::config::global { "nagios3.conf":
-        ensure => link,
-        target => "${nagios::defaults::vars::int_cfgdir}/apache2.conf",
-        require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"],
-      }
-    }
+    manage_munin       => $manage_munin,
+    manage_shorewall   => $manage_shorewall,
   }
 }