X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3e98fe82128ddb5cfbf735265e5e7163f690d7ec;hb=b9e53ed63b36eba8d0a1cf5c194da940e663d297;hp=5e9f86120460f7be8c5bed1b47d756d0a2914fdc;hpb=d2f98144fc22ea7db840ae75012818bcebff4bbb;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 5e9f86120..3e98fe821 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,18 +2,58 @@ 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
+    include sudo
     include debian-org
 
     case $smartarraycontroller {
         "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: {}
+    }
+
+    case $hostname {
+        brahms,goetz,lafayette,malo,praetorius,puccini:
+                   { include buildd }
+	geo1,geo2,geo3:
+		   { include geodns }
+        default:   {}
+    }
+
 }
 
+node penalosa inherits default {
+    include hosts
+}