From 0fe7552f256f0b1508cc5d3cab952eb93bee6811 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 5 Jun 2012 19:34:51 -0300
Subject: new style for 2.7

---
 manifests/apache.pp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'manifests/apache.pp')

diff --git a/manifests/apache.pp b/manifests/apache.pp
index 6acf538..0696723 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -1,20 +1,21 @@
 class nagios::apache inherits ::apache {
-    $nagios_httpd = 'apache'
-    include nagios
+    class{'nagios':
+      httpd => 'apache'
+    }
 
     case $::operatingsystem {
         'debian': {
-            file { "${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf":
+            file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf":
                 ensure => present,
-                source => ["puppet:///site-nagios/configs/${fqdn}/apache2.conf",
-                           "puppet:///site-nagios/configs/apache2.conf",
+                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_nagios_cfgdir}/apache2.conf",
-                require => File["${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf"],
+                target => "${nagios::defaults::vars::int_cfgdir}/apache2.conf",
+                require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"],
             }
         }
     }
-- 
cgit v1.2.3