From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 31 Jan 2010 21:40:33 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6ed568b6908f085d89f776d55e717ef100bda2d2;hp=472c81943ab3f76fa7d416e4176c65d098051e2e;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  add aacraid fact
  add alkman.debian.org
  add purcell to mailout
---

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index 2bc3f0ed1..acd46b845 100644
--- a/facts/raidarray.rb
+++ b/facts/raidarray.rb
@@ -25,6 +25,13 @@ Facter.add("ThreeWarecontroller") do
 	end
 end
 
+Facter.add("aacraid") do
+	confine :kernel => :linux
+	setcode do
+		FileTest.exist?("/dev/aac0")
+	end
+end
+
 Facter.add("swraid") do
 	confine :kernel => :linux
 	setcode do
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 8e5e8fdaf..0d0a45bc8 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -140,6 +140,7 @@ host_settings:
     - villa.debian.org
     - wieck.debian.org
   buildd:
+    - alkman.debian.org
     - ancina.debian.org
     - arcadelt.debian.org
     - argento.debian.org
@@ -178,6 +179,7 @@ host_settings:
     agnesi.debian.org: mailout.debian.org
     agricola.debian.org: mailout.debian.org
     albeniz.debian.org: mailout.debian.org
+    alkman.debian.org: mailout.debian.org
     ancina.debian.org: mailout.debian.org
     arcadelt.debian.org: mailout.debian.org
     argento.debian.org: mailout.debian.org
@@ -232,6 +234,7 @@ host_settings:
     piatti.debian.org: mailout.debian.org
     praetorius.debian.org: mailout.debian.org
     puccini.debian.org: mailout.debian.org
+    purcell.debian.org: mailout.debian.org
     raff.debian.org: mailout.debian.org
     rautavaara.debian.org: mailout.debian.org
     rem.debian.org: mailout.debian.org