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

diff --git a/manifests/site.pp b/manifests/site.pp
index 4758621b3..05964ac24 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,6 +2,13 @@ Package {
     require => File["/etc/apt/apt.conf.d/local-recommends"]
 }
 
+File {
+    owner   => root,
+    group   => root,
+    mode    => 444,
+    ensure  => file,
+}
+
 node default {
     include munin-node
     include samhain
@@ -11,9 +18,38 @@ node default {
         "true":    { include debian-proliant }
         default: {}
     }
+
     case $mta {
         "exim4":   { include exim }
         default:   {}
     }
+
+    import "nagios"
+    include nagios-client
+
+    case $hostname {
+        spohr:     {
+                      import "nagios"
+                      include nagios-server
+                   }
+        default:   {}
+    }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        "carver":  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
+
+    # test here first
+    case $hostname {
+        handel,geo1,geo2,geo3,wieck,brahms,bartok,spohr,sperger,carver,rore,malo,peri,penalosa,praetorius:    { include sudo }
+        default:   {}
+    }
 }
 
+node penalosa inherits default {
+    include hosts
+}