X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3c862097c8b2fe8540b4b62a9ec82e884f17d4b9;hb=767eac9dbdbc0916e27ca9a423713069a9145370;hp=0c71c52d3469b62856491d215dff63c789f453fb;hpb=da0daac848f0f8e481932be94be791f37fe8a9bf;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 0c71c52d3..3c862097c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,7 +16,7 @@ Exec {
 node default {
     $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")
+    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord physicalHost purpose")
     notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
@@ -35,42 +35,29 @@ node default {
         finzi,fano,fasch,field:    { include kfreebsd }
     }
 
-    case $hostname {
-        heininen:    {
-            include "stunnel4"
-            stunnel4::stunnel_server {
-                "ekeyd":
-                    accept => 18888,
-                    connect => "127.0.0.1:8888",
-                    ;
-            }
-        }
-        unger:    {
-            include "stunnel4"
-            stunnel4::stunnel_client {
-                "ekeyd":
-                    accept => "127.0.0.1:8888",
-                    connecthost => "heininen.debian.org",
-                    connectport => 18888,
-                    ;
-            }
-        }
-    }
-
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
     case $kvmdomain {
         "true": {
-            package { acpid: ensure => installed }
-            case getfromhash($nodeinfo, 'squeeze') {
-                true:  { package { acpi-support-base: ensure => installed } }
+            case $debarchitecture {
+                kfreebsd-amd64,kfreebsd-i386: {
+                }
+                default: {
+                    package { acpid: ensure => installed }
+                    case getfromhash($nodeinfo, 'squeeze') {
+                        true:  { package { acpi-support-base: ensure => installed } }
+                    }
+                }
             }
         }
     }
     case $mptraid {
         "true":    { include "raidmpt" }
     }
+    case $productname {
+        "PowerEdge 2850": { include megactl }
+    }
 
     case $mta {
         "exim4":   {
@@ -102,6 +89,12 @@ node default {
               case getfromhash($nodeinfo, 'apache2_www_mirror') {
                      true:    { include apache2::www_mirror }
               }
+              case getfromhash($nodeinfo, 'apache2_backports_mirror') {
+                     true:    { include apache2::backports_mirror }
+              }
+              case getfromhash($nodeinfo, 'apache2_ftp-upcoming_mirror') {
+                     true:    { include apache2::ftp-upcoming_mirror }
+              }
               include apache2
          }
     }
@@ -118,9 +111,9 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff,draghi: { include named::authoritative }
-        geo1,geo2,geo3:                  { include named::geodns }
-        liszt:                           { include named::recursor }
+        klecker,ravel,senfl,orff,draghi,diamond: { include named::authoritative }
+        geo1,geo2,geo3:                          { include named::geodns }
+        liszt:                                   { include named::recursor }
     }
     case $hostname {
         franck,master,lobos,samosa,spohr,widor:   { include unbound }
@@ -141,7 +134,7 @@ node default {
     }
 
     case $hostname {
-        beethoven,ravel,spohr,stabile: {
+        beethoven,duarte,ravel,spohr,stabile: {
             include nfs-server
         }
     }
@@ -156,24 +149,21 @@ node default {
     include samhain
 
     case $hostname {
-        byrd,schuetz,tchaikovsky: {
+        byrd,schuetz,tchaikovsky,draghi,quantz,lamb,locke,rautavaara,rietz: {
             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
         }
-   }
+    }
+
+    case $kernel {
+        Linux: { include entropykey }
+    }
+
 }
 
 # vim:set et: