X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=f3e19addc9ce4c5e7386cf656e97fb38a1dc3cb5;hb=cc4d1e9f6a82195154bf8705a3f5f788aed666e6;hp=11199447c598e1cb2d9685366a75b7a94db358c6;hpb=c07d0174d8b5e64bb66187a6bc63815328f5492f;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 11199447c..f3e19addc 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,28 +35,32 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    include nagios-client
 
     case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
-        default:   {}
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
     }
 
     case $apache2 {
         "true":    { case $hostname {
-                        "carver":  { include apache2 }
+                        carver,rore,tartini:  { include apache2 }
                         default:   {}
                    } }
         default: {}
     }
 
-    # test here first
     case $hostname {
-        handel,geo1,geo2,geo3,wieck,brahms,bartok,spohr,sperger,carver,rore,malo,peri,penalosa,praetorius,schein,villa,lobos,steffani,kassia,pergolesi,lafayette,rem,albeniz,goetz,smetana,allegri,puccini,ball,argento,arcadelt,dijkstra,schumann,caballero,voltaire,pescetti,mundy,agricola,goedel,lebrun,mayer,mayr,merulo,morales,murphy,paer,saens,schroeder,spontini,widor,zelenka,agnesi,piatti,powell,samosa,gluck,rietz,unger,tartini,mahler,raff,chopin,ravel,ries,master:    { include sudo }
+        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+                   { include buildd }
+        default:   {}
+    }
+    case $hostname {
+        geo1,geo2,geo3:
+                   { include geodns }
         default:   {}
     }
 }