sudo everywhere

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 114768ec4d4962249a79ed026e4fad7f15ac447d..e6ba84d87b53cc4cd39368cc5247b95a1f20eec5 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -12,6 +12,7 @@ File {
 node default {
     include munin-node
     include samhain
+    include sudo
     include debian-org
 
     case $smartarraycontroller {
@@ -24,14 +25,24 @@ node default {
         default:   {}
     }
 
+    import "nagios"
+    include nagios-client
+
     case $hostname {
-        spohr,bartok:
-                   {
+        spohr:     {
                       import "nagios"
-                      include nagios-client
+                      include nagios-server
                    }
         default:   {}
     }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        "carver":  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
 }
 
 node penalosa inherits default {