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

diff --git a/manifests/site.pp b/manifests/site.pp
index 4758621b3..b8f396b91 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,18 +2,88 @@ 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 {
+    $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 ntp
+
+    include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
         default: {}
     }
+
     case $mta {
-        "exim4":   { include exim }
+        "exim4":   {
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
+                  default: { include exim }
+             }
+        }
         default:   {}
     }
-}
 
+
+    case $hostname {
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
+    }
+
+     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+          "true":  { include apache2 }
+           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:   {}
+    }
+
+     case $hostname {
+         geo1,geo2,geo3:
+                    {
+                      include named::geodns
+                    }
+         default:   {
+                    }
+     }
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
+}