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

diff --git a/manifests/site.pp b/manifests/site.pp
index 4758621b3..d8d74907a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,18 +2,70 @@ Package {
     require => File["/etc/apt/apt.conf.d/local-recommends"]
 }
 
+File {
+    owner   => root,
+    group   => root,
+    mode    => 444,
+    ensure  => file,
+}
+
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
-    include samhain
+    include sudo
     include debian-org
+    include monit
+    include samhain
+
+    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
+    notice($nodeinfo.class)
+    notice($nodeinfo)
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
         default: {}
     }
+
     case $mta {
         "exim4":   { include exim }
         default:   {}
     }
+
+
+    case $hostname {
+        spohr: {
+                      include nagios::server
+                      include motd::new
+        }
+        default: {
+		      include nagios::client
+                      include motd
+	}
+    }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        carver,rore,tartini:  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
+
+    case $hostname {
+        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+                   { include buildd }
+        default:   {}
+    }
+    case $hostname {
+        geo1,geo2,geo3:
+                   { include geodns }
+        default:   {}
+    }
 }
 
+node penalosa inherits default {
+    include hosts
+}