X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=11ae5c60ecb28de46562412041947113e2d1a1c5;hb=6999e9642097e4dbe2555f1c3abe4bdd19e6bc1b;hp=13d7f4618360e28b5c2070677ec8a6a7f397bfcb;hpb=87e735a30778a83e35894c07ff7d4bdaf8fe05e1;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 13d7f4618..11ae5c60e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,78 +14,149 @@ Exec {
 }
 
 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}")
+    $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
+    $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
+    include syslog-ng
     include sudo
     include ssh
     include debian-org
     include monit
     include apt-keys
     include ntp
+    include ssl
 
     include motd
-    include samhain
+
+    case $hostname {
+        finzi,fano,fasch,field:    { include kfreebsd }
+    }
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
-        default: {}
+    }
+    case $kvmdomain {
+        "true": {
+            package { acpid: ensure => installed }
+            case getfromhash($nodeinfo, 'squeeze') {
+                true:  { package { acpi-support-base: ensure => installed } }
+            }
+        }
+    }
+    case $mptraid {
+        "true":    { include "raidmpt" }
     }
 
     case $mta {
         "exim4":   {
-             case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  "true":  { include exim::mx }
+             case getfromhash($nodeinfo, 'heavy_exim') {
+                  true:  { include exim::mx }
                   default: { include exim }
              }
         }
-        default:   {}
+    }
+
+    case getfromhash($nodeinfo, 'puppetmaster') {
+        true: { include puppetmaster }
+    }
+
+    case getfromhash($nodeinfo, 'muninmaster') {
+        true: { include munin-node::master }
+    }
+
+    case getfromhash($nodeinfo, 'nagiosmaster') {
+        true:    { include nagios::server }
+        default: { include nagios::client }
+    }
+
+    case $apache2 {
+         "true":  {
+              case getfromhash($nodeinfo, 'apache2_security_mirror') {
+                     true:    { include apache2::security_mirror }
+              }
+              case getfromhash($nodeinfo, 'apache2_www_mirror') {
+                     true:    { include apache2::www_mirror }
+              }
+              include apache2
+         }
+    }
+
+    case $rsyncd {
+         "true": { include rsyncd-log }
     }
 
 
+    case getfromhash($nodeinfo, 'buildd') {
+         true:  {
+             include buildd
+         }
+    }
+
     case $hostname {
-        spohr: {
-                      include nagios::server
+        klecker,ravel,senfl,orff,draghi: { include named::authoritative }
+        geo1,geo2,geo3:                  { include named::geodns }
+        liszt,widor:                     { include named::recursor }
+    }
+    case $hostname {
+        franck,master,murphy,ries,samosa,spohr:   {
+            include unbound
+            $runs_local_resolver = true
         }
         default: {
-		      include nagios::client
-	}
+            $runs_local_resolver = false
+        }
     }
+    include resolv
 
-     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
-          "true":  { include apache2 }
-           default: { }
-     }
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+            case $rsyncd {
+                "true": { include ferm::rsync }
+            }
+        }
+    }
 
-     case extractnodeinfo($nodeinfo, 'buildd') {
-          "true":  { include buildd }
-           default: { }
-     }
-     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-          "true":  { include apache2::security_mirror }
-           default: { }
-     }
+    case $hostname {
+        beethoven,ravel,spohr,stabile: {
+            include nfs-server
+        }
+    }
 
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $portforwarder_user_exists {
+        "true":    { include portforwarder }
+    }
+
+    include samhain
 
-# 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:   {}
-     }
+        byrd,schuetz,tchaikovsky: {
+            include krb
+        }
+        draghi,quantz: {
+            include krb
+            include afs
+        }
+        lamb,locke,rautavaara,rietz: {
+            include krb
+            include afs::server
+        }
+    }
+
+    case $hostname {
+        chopin,geo3,soler,wieck: {
+            include debian-radvd
+        }
+   }
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: