X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=398da0ab9f244aa57170560ea4dea3105e8987b6;hb=3b9bedfb9c7e5cd42e2d198b8dbd7a8649a3608d;hp=c843705575ed67583dc5b85ddf7ae8edfee45683;hpb=0487f3da2230709f8381b1160b6c7e06a88b2887;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index c84370557..398da0ab9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,10 +16,8 @@ Exec {
 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")
-    $mxinfo    = allnodeinfo("mXRecord")
-    notice("hoster for ${fqdn} is ${hoster}")
+    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
     include syslog-ng
@@ -37,11 +35,25 @@ node default {
         finzi,fano,fasch,field:    { include kfreebsd }
     }
 
+    case $hostname {
+        heininen:    {
+            include "entropykey::provider"
+        }
+        unger:    {
+            include "entropykey::remote_consumer"
+        }
+    }
+
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
     case $kvmdomain {
-        "true":    { package { acpid: ensure => installed } }
+        "true": {
+            package { acpid: ensure => installed }
+            case getfromhash($nodeinfo, 'squeeze') {
+                true:  { package { acpi-support-base: ensure => installed } }
+            }
+        }
     }
     case $mptraid {
         "true":    { include "raidmpt" }
@@ -49,33 +61,45 @@ node default {
 
     case $mta {
         "exim4":   {
-             case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  'true':  { include exim::mx }
+             case getfromhash($nodeinfo, 'heavy_exim') {
+                  true:  { include exim::mx }
                   default: { include exim }
              }
         }
     }
 
-    case extractnodeinfo($nodeinfo, 'muninmaster') {
+    case getfromhash($nodeinfo, 'puppetmaster') {
+        true: { include puppetmaster }
+    }
+
+    case getfromhash($nodeinfo, 'muninmaster') {
         true: { include munin-node::master }
     }
 
-    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+    case getfromhash($nodeinfo, 'nagiosmaster') {
         true:    { include nagios::server }
         default: { include nagios::client }
     }
 
     case $apache2 {
          "true":  {
-              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+              case getfromhash($nodeinfo, 'apache2_security_mirror') {
                      true:    { include apache2::security_mirror }
-                     default: { include apache2 }
               }
+              case getfromhash($nodeinfo, 'apache2_www_mirror') {
+                     true:    { include apache2::www_mirror }
+              }
+              include apache2
          }
     }
 
-    case extractnodeinfo($nodeinfo, 'buildd') {
-         'true':  {
+    case $rsyncd {
+         "true": { include rsyncd-log }
+    }
+
+
+    case getfromhash($nodeinfo, 'buildd') {
+         true:  {
              include buildd
          }
     }
@@ -83,18 +107,28 @@ 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 }
+        liszt:                           { include named::recursor }
+    }
+    case $hostname {
+        franck,master,lobos,samosa,spohr,widor:   { include unbound }
+    }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
     }
+    include resolv
 
     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
         }
     }
@@ -102,9 +136,6 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case $hoster {
-        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
-    }
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
@@ -112,18 +143,24 @@ node default {
     include samhain
 
     case $hostname {
-        byrd,schuetz: {
+        byrd,schuetz,tchaikovsky: {
             include krb
         }
-        bartok,draghi: {
+        draghi,quantz: {
             include krb
             include afs
         }
-        lamb,locke,rautavaara: {
+        lamb,locke,rautavaara,rietz: {
             include krb
             include afs::server
         }
     }
+
+    case $hostname {
+        chopin,geo3,soler,wieck: {
+            include debian-radvd
+        }
+   }
 }
 
 # vim:set et: