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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: (31 commits)
  Drop handling of [debian rt], just strip the debian rt tag
  Make sure to fix up subject headers for all RT addresses, not just one
  Avoid testing first_delivery as it appears it is not set for a router
  Strip out "debian rt" from subjects going into RT
  line terminators, bah
  ranges for Mithrandir
  and also in the mime acl
  mundy -> squeeze
  dak -> dak-unpriv
  turns out we want -v as well
  and we want the restricted list
  add megactl package, and sudo for nagios
  and ignore the new file
  if we declare a dependency on schroot, it needs to be a resource
  kassia and merikanto to ftp-upcoming
  ftp-upcoming.debian.org dns
  ftp-upcoming
  ftp-upcoming
  fix username vs. groupname
  accounting sudo
  ...

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index e16eeeb..d2cfa35 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -15,6 +15,7 @@ nameinfo:
   barber.debian.org: Samuel Barber (March 9th, 1910 - January 23rd, 1981)
   beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827)
   bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835)
+  berlioz.debian.org: Hector Berlioz (December 11th, 1803 - March 8th, 1869)
   biber.debian.org: Heinrich Ignaz Franz von Biber (August 12th, 1664 - May 3rd, 1704)
   brahms.debian.org: Johannes Brahms (May 7th, 1833 - April 3rd, 1897)
   busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
@@ -240,6 +241,7 @@ host_settings:
     - barber.debian.org
     - beethoven.debian.org
     - bellini.debian.org
+    - berlioz.debian.org
     - biber.debian.org
     - brahms.debian.org
     - busoni.debian.org
@@ -351,6 +353,7 @@ host_settings:
     ball.debian.org: mailout.debian.org
     barber.debian.org: mailout.debian.org
     beethoven.debian.org: mailout.debian.org
+    berlioz.debian.org: mailout.debian.org
     biber.debian.org: mailout.debian.org
     brahms.debian.org: mailout.debian.org
     byrd.debian.org: mailout.debian.org