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 2bc3f0ed19f61e57ae22d9c4edf5fb0ff47f4a9d..acd46b84559708fcbf5e2a22ce41344a5fe88510 100644 (file)
--- 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 8e5e8fdaf9c11e70403b32fa7c4b9b410831b09b..0d0a45bc8fe0dbe652c1cd7ec2b9f017a93504ce 100644 (file)
--- 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