X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=9e657d5bc7d10fe867dbcf84e5e941854deb66d9;hb=495710bad4d8b8e0e369844fb9327cf06924ab4c;hp=114768ec4d4962249a79ed026e4fad7f15ac447d;hpb=b99f9b4fe8c0d8fff370dc2a144f2ed952e93add;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 114768ec4..9e657d5bc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,10 +9,21 @@ File {
     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
+    include apt-keys
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
+    include motd
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -24,12 +35,40 @@ node default {
         default:   {}
     }
 
+
+    case $hostname {
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
+    }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        carver,rore,draghi,tartini,samosa,duarte:  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
+
+    case $hostname {
+        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
+                   { include buildd }
+        default:   {}
+    }
+
+# maybe wait for rietz to be upgraded to lenny
+#    case $hostname {
+#        rietz,raff,klecker:
+#                   { include named-secondary }
+#        default:   {}
+#    }
+
     case $hostname {
-        spohr,bartok:
-                   {
-                      import "nagios"
-                      include nagios-client
-                   }
+        geo1,geo2,geo3:
+                   { include geodns }
         default:   {}
     }
 }