So, if you require a package in a files block you also need to declare it

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 095a2c6..5db5607 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -24,23 +24,24 @@ node default {
         default:   {}
     }
 
-    case $hostname {
-        spohr,bartok:
-                   {
-                      import "nagios"
-                      include nagios-client
-                   }
-        default:   {}
-    }
-
+    import "nagios"
+    include nagios-client
 
     case $hostname {
-        spohr      {
+        spohr:     {
                       import "nagios"
                       include nagios-server
                    }
         default:   {}
     }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        "carver":  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
 }
 
 node penalosa inherits default {