X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=6c7ec54d0b71ebd5c4222578c8b3ab940357e292;hb=5c4079104b5b0e3cf35fef2df9d2f75e987ed8c8;hp=f56d6ed3d2da1da0218c1fed67a953e651d67485;hpb=f6503c57cabbd55b5dc7393d0ee757715e99cdf7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f56d6ed3d..6c7ec54d0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,15 +40,24 @@ node default {
     }
     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":   {
@@ -83,6 +92,9 @@ node default {
               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
          }
     }
@@ -137,16 +149,8 @@ node default {
     include samhain
 
     case $hostname {
-        byrd,schuetz,tchaikovsky: {
-            include krb
-        }
-        draghi,quantz: {
-            include krb
-            include afs
-        }
-        lamb,locke,rautavaara,rietz: {
+        byrd,schuetz,tchaikovsky,draghi,quantz,lamb,locke,rautavaara,rietz: {
             include krb
-            include afs::server
         }
     }