X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=05964ac245d7943650cf1cd303af0b0b732050e0;hb=a669a28d8b7bf52b9cd715d6ff5095bfb41abb23;hp=171d077a054342a88f749a921a41b580a31cf802;hpb=c3663e3d051ab3c217aec126fe77b949b54cc167;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 171d077a0..05964ac24 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -24,21 +24,28 @@ node default {
         default:   {}
     }
 
+    import "nagios"
+    include nagios-client
+
     case $hostname {
-        spohr,bartok,geo1:
-                   {
+        spohr:     {
                       import "nagios"
-                      include nagios-client
+                      include nagios-server
                    }
         default:   {}
     }
 
+    case $apache2 {
+        "true":    { case $hostname {
+                        "carver":  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
 
+    # test here first
     case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
+        handel,geo1,geo2,geo3,wieck,brahms,bartok,spohr,sperger,carver,rore,malo,peri,penalosa,praetorius:    { include sudo }
         default:   {}
     }
 }