X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d5398f82772011d63a1fedc5155c01fd3c2410db;hb=c1f9b4855bc047dc0181065e0b25250e4e647246;hp=5e9f86120460f7be8c5bed1b47d756d0a2914fdc;hpb=d2f98144fc22ea7db840ae75012818bcebff4bbb;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 5e9f86120..9398f1c11 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,18 +2,79 @@ 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")
+    $hoster   = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+    notice("hoster for ${fqdn} is ${hoster}")
+
     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 }
-        default:   {}
+        "exim4":   {
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
+                  default: { include exim }
+             }
+        }
+    }
+
+    case $hostname {
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
     }
-}
 
+    case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+         "true":  { include apache2 }
+    }
+
+    case extractnodeinfo($nodeinfo, 'buildd') {
+         "true":  { include buildd }
+    }
+    case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+         "true":  { include apache2::security_mirror }
+    }
+
+
+# maybe wait for rietz to be upgraded to lenny
+    case $hostname {
+        rietz,raff,klecker: { include named::secondary }
+    }
+
+    case $hostname {
+        geo1,geo2,geo3: { include named::geodns }
+    }
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $hoster {
+        "ubcece":  { include resolv }
+    }
+}