X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d8f1b09cbfced976b19ac04c2d4dbb36566bedf8;hb=4b8bd3b11bf706f3cfdcf8e07e4f5abda3b93750;hp=c13ecb2ea8aaa3850145ee611b95bc727a86eba0;hpb=5b99a29d3b4c28cb3e402e26e4cf17e116209ff7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index c13ecb2ea..d8f1b09cb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,10 +9,22 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
     include munin-node
-    include samhain
+    include sudo
+    include ssh
     include debian-org
+    include monit
+    include apt-keys
+
+    include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -20,36 +32,59 @@ node default {
     }
 
     case $mta {
-        "exim4":   { include exim }
+        "exim4":   {
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
+                  default: { include exim }
+             }
+        }
         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 }
-                        default:   {}
-                   } }
-        default: {}
-    }
+     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+          "true":  { include apache2 }
+           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:    { include sudo }
-        default:   {}
-    }
-}
+     case extractnodeinfo($nodeinfo, 'buildd') {
+          "true":  { include buildd }
+           default: { }
+     }
+     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+          "true":  { include apache2::security_mirror }
+           default: { }
+     }
+
+
+# maybe wait for rietz to be upgraded to lenny
+#    case $hostname {
+#        rietz,raff,klecker:
+#                   { include named-secondary }
+#        default:   {}
+#    }
 
-node penalosa inherits default {
-    include hosts
+     case $hostname {
+         geo1,geo2,geo3:
+                    {
+                      include geodns
+                      include ntp::server
+                    }
+         default:   {
+                      include ntp::client
+                    }
+     }
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }