From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 28 Mar 2011 09:03:27 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=15062a72439ce99b64b0a4e663aaf6023a313259;hp=2b03e3da8ca72b905d55d6b4484fc86b3cff31d1;p=mirror%2Fdsa-puppet.git

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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  give the debbugs people access to the debbugs-mirror user too
  busoni on squeeze
  pettersson on squeeze
  stabile on squeeze
  soler on squeeze
  schumann on squeeze
  villa on squeeze
  mpt raid gets confined to linux for now
  Exim should also accept v6 connections over lo
---

diff --git a/modules/debian-org/lib/facter/raidarray.rb b/modules/debian-org/lib/facter/raidarray.rb
index 997bf141f..28fdca489 100644
--- a/modules/debian-org/lib/facter/raidarray.rb
+++ b/modules/debian-org/lib/facter/raidarray.rb
@@ -26,6 +26,7 @@ Facter.add("megaraid") do
 end
 
 Facter.add("mptraid") do
+	confine :kernel => :linux
 	setcode do
 		FileTest.exist?("/dev/mptctl") or FileTest.exist?("/dev/mpt0") or FileTest.exist?("/proc/mpt/summary")
 	end
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 241169d02..3dfead9cc 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -229,6 +229,7 @@ host_settings:
     - beethoven.debian.org
     - biber.debian.org
     - brahms.debian.org
+    - busoni.debian.org
     - byrd.debian.org
     - chopin.debian.org
     - cilea.debian.org
@@ -257,6 +258,7 @@ host_settings:
     - morricone.debian.org
     - murphy.debian.org
     - nono.debian.org
+    - pettersson.debian.org
     - piatti.debian.org
     - quantz.debian.org
     - raff.debian.org
@@ -272,12 +274,16 @@ host_settings:
     - scelsi.debian.org
     - schein.debian.org
     - schuetz.debian.org
+    - schumann.debian.org
     - sibelius.debian.org
     - smetana.debian.org
+    - soler.debian.org
     - spohr.debian.org
+    - stabile.debian.org
     - tchaikovsky.debian.org
     - traetta.debian.org
     - unger.debian.org
+    - villa.debian.org
     - vitry.debian.org
     - widor.debian.org
     - wieck.debian.org
diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 428e3561a..131550e77 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -119,7 +119,7 @@ localpartlist local_only_users = lsearch;/etc/exim4/localusers
 
 localpartlist postmasterish = postmaster : abuse : hostmaster
 
-hostlist debianhosts = : 127.0.0.1 : /var/lib/misc/thishost/debianhosts
+hostlist debianhosts = <; ; 127.0.0.1 ; ::1 ; /var/lib/misc/thishost/debianhosts
 
 hostlist reservedaddrs = <%= nodeinfo['reservedaddrs'] %>
 
diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index ed437c0a5..ebdfee847 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -73,6 +73,7 @@ nagios		beethoven=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 %dde		ALL=(dde)	ALL
 %debadmin	ALL=(dak)	ALL
 %debbugs	ALL=(debbugs)	ALL
+%debbugs	ALL=(debbugs-mirror)	ALL
 %debian-cd	ALL=(debian-cd)	ALL
 %debian-release	ALL=(release)	ALL
 %debvoip	cilea=(freeswitch)	ALL