From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 31 Mar 2009 18:38:33 +0000 (+0200)
Subject: Import nagios module
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=26f4aacbfbf7ff7777e3d4c1c451a19e310ac272;p=mirror%2Fdsa-puppet.git

Import nagios module
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 08f6c850d..1a80b225e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -25,7 +25,10 @@ node default {
     }
 
     case $hostname {
-        spohr:     { include nagiosclient }
+        spohr:     {
+                      import "nagios"
+                      include nagios-client
+                   }
         default:   {}
     }
 }
diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index b59960433..7a3fa5f8b 100644
--- a/modules/nagios/manifests/init.pp
+++ b/modules/nagios/manifests/init.pp
@@ -1,4 +1,4 @@
-class nagiosclient {
+class nagios-client {
 	package {
 		nagios-nrpe-server: ensure => installed;
 		dsa-nagios-checks: ensure => installed;