From: Stephen Gran <steve@lobefin.net>
Date: Tue, 29 Mar 2011 06:35:13 +0000 (+0100)
Subject: Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8d0743ee35472ab833278afcc01c5962ace5b46c;hp=8481c9f9692c692da98229ccd1774489efd5bf49;p=mirror%2Fdsa-puppet.git

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

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 241169d02..817750459 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
@@ -244,12 +245,14 @@ host_settings:
     - geo1.debian.org
     - geo2.debian.org
     - geo3.debian.org
+    - gluck.debian.org
     - heininen.debian.org
     - kassia.debian.org
     - kaufmann.debian.org
     - krenek.debian.org
     - lamb.debian.org
     - lindberg.debian.org
+    - lobos.debian.org
     - locke.debian.org
     - lotti.debian.org
     - luchesi.debian.org
@@ -257,6 +260,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 +276,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/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml
index 75bc81bc5..ad9abaa8e 100644
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@ -28,7 +28,7 @@ paganini.debian.org:
 quantz.debian.org:
   # qa->projectb mirror
   - source_bind_port: 5433
-    target_host: merkel.debian.org
+    target_host: ries.debian.org
     target_port: 5433
   # qa->udd
   - source_bind_port: 5441
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