X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3e5e5f312153af9bc5764a539457e84edebd7631;hb=5430090f26c627828a0e8e267be34ff687e76920;hp=564d270fc662a5776985b738714fe58baea0fcdf;hpb=b3f915434eb31aef5a7730178c1c3b608a011059;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 564d270fc..3e5e5f312 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,7 +17,7 @@ node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber")
+    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
     $mxinfo    = allnodeinfo("mXRecord")
     notice("hoster for ${fqdn} is ${hoster}")
 
@@ -41,7 +41,12 @@ node default {
         "true":    { include debian-proliant }
     }
     case $kvmdomain {
-        "true":    { package { acpid: ensure => installed } }
+        "true": {
+            package { acpid: ensure => installed }
+            case extractnodeinfo($nodeinfo, 'squeeze') {
+                true:  { package { acpi-support-base: ensure => installed } }
+            }
+        }
     }
     case $mptraid {
         "true":    { include "raidmpt" }
@@ -50,12 +55,16 @@ node default {
     case $mta {
         "exim4":   {
              case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  'true':  { include exim::mx }
+                  true:  { include exim::mx }
                   default: { include exim }
              }
         }
     }
 
+    case extractnodeinfo($nodeinfo, 'puppetmaster') {
+        true: { include puppetmaster }
+    }
+
     case extractnodeinfo($nodeinfo, 'muninmaster') {
         true: { include munin-node::master }
     }
@@ -69,13 +78,21 @@ node default {
          "true":  {
               case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
                      true:    { include apache2::security_mirror }
-                     default: { include apache2 }
               }
+              case extractnodeinfo($nodeinfo, 'apache2_www_mirror') {
+                     true:    { include apache2::www_mirror }
+              }
+              include apache2
          }
     }
 
+    case $rsyncd {
+         "true": { include rsyncd-log }
+    }
+
+
     case extractnodeinfo($nodeinfo, 'buildd') {
-         'true':  {
+         true:  {
              include buildd
          }
     }
@@ -83,18 +100,21 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        bartok,franck,liszt,master,samosa,schein,spohr,steffani:   { include named::recursor }
+        franck,liszt,master,samosa,schein,spohr,steffani,widor:   { include named::recursor }
     }
 
     case $kernel {
         Linux: {
             include ferm
             include ferm::per-host
+            case $rsyncd {
+                "true": { include ferm::rsync }
+            }
         }
     }
 
     case $hostname {
-        beethoven,ravel,spohr: {
+        beethoven,ravel,spohr,stabile: {
             include nfs-server
         }
     }
@@ -112,11 +132,24 @@ node default {
     include samhain
 
     case $hostname {
-        byrd,schuetz,draghi,lamb,locke,rautavaara:    { include krb }
+        byrd,schuetz,tchaikovsky: {
+            include krb
+        }
+        draghi,quantz: {
+            include krb
+            include afs
+        }
+        lamb,locke,rautavaara,rietz: {
+            include krb
+            include afs::server
+        }
     }
+
     case $hostname {
-        lamb,locke,rautavaara:    { include afs::server }
-    }
+        chopin,geo3,soler,wieck: {
+            include debian-radvd
+        }
+   }
 }
 
 # vim:set et: