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

[mirror/dsa-puppet.git] / modules / debian-org / misc / local.yaml

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 7c25738..98cce62 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -17,12 +17,14 @@ nameinfo:
   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)
+  blavet.debian.org: Michel Blavet (March 13, 1700 - October 28, 1768)
   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)
   byrd.debian.org: William Byrd (1543 - July 4th, 1623)
   chopin.debian.org: Frédéric Chopin (March 1st, 1810 - October 17th, 1849)
   cilea.debian.org: Francesco Cilèa (July 26th, 1866 - November 20th, 1950)
   corelli.debian.org: Arcangelo Corelli (February 17th, 1653 - January 8th, 1713)
+  czerny.debian.org: Carl Czerny (February 21st, 1791 - July 15th, 1857)
   danzi.debian.org: Franz Ignaz Danzi (June 15th, 1763 - April 13th, 1826)
   diamond.debian.org: David Leo Diamond (July 9, 1915 - June 13, 2005)
   dijkstra.debian.org: Lowell Dijkstra (b.1952)
@@ -129,7 +131,9 @@ nameinfo:
   wieck.debian.org: Clara Josephine Wieck (September 13th, 1819 - May 20th, 1896)
   wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
   zandonai.debian.org: Riccardo Zandonai (May 30th, 1883 - June 5th, 1944)
+  zappa.debian.org: Frank Vincent Zappa (December 21st, 1940 - December 4th, 1993)
   zelenka.debian.org: Jan Dismas Zelenka (October 16th, 1679 - December 23rd, 1745)
+  zemlinsky.debian.org: Alexander von Zemlinsky (October 14th, 1871 - March 15th 1942)
 footer:
   zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
@@ -147,7 +151,7 @@ services:
   extranrpeclient:
     - orff.debian.org
   packagesmaster: powell.debian.org
-  packagesqamaster: master.debian.org
+  packagesqamaster: quantz.debian.org
   puppetmaster: handel.debian.org
   rtmaster:
     - reger.debian.org
@@ -189,6 +193,7 @@ host_settings:
   'apache2_ftp-upcoming_mirror':
     - rietz.debian.org
     - kassia.debian.org
+    - klecker.debian.org
     - merikanto.debian.org
   apache2_backports_mirror:
     - englund.debian.org
@@ -224,6 +229,7 @@ host_settings:
     - hasse.debian.org
     - hebden.debian.org
     - henze.debian.org
+    - hoiby.debian.org
     - krenek.debian.org
     - lebrun.debian.org
     - lucatelli.debian.org
@@ -241,6 +247,8 @@ host_settings:
     - spontini.debian.org
     - vitry.debian.org
     - zandonai.debian.org
+    - zappa.debian.org
+    - zemlinsky.debian.org
     - zee.debian.org
   #wheezy:
   #  - harris.debian.org
@@ -385,12 +393,14 @@ host_settings:
     beethoven.debian.org: mailout.debian.org
     berlioz.debian.org: mailout.debian.org
     biber.debian.org: mailout.debian.org
+    blavet.debian.org: mailout.debian.org
     brahms.debian.org: mailout.debian.org
     byrd.debian.org: mailout.debian.org
     caballero.debian.org: mailout.debian.org
     cilea.debian.org: mailout.debian.org
     corelli.debian.org: mailout.debian.org
     crest.debian.org: mailout.debian.org
+    czerny.debian.org: mailout.debian.org
     danzi.debian.org: mailout.debian.org
     diamond.debian.org: mailout.debian.org
     dijkstra.debian.org: mailout.debian.org
@@ -489,12 +499,16 @@ host_settings:
     widor.debian.org: mailout.debian.org
     wieck.debian.org: mailout.debian.org
     zandonai.debian.org: mailout.debian.org
+    zappa.debian.org: mailout.debian.org
     zee.debian.org: mailout.debian.org
     zelenka.debian.org: mailout.debian.org
+    zemlinsky.debian.org: mailout.debian.org
   mail_port:
     ancina.debian.org: 2025
     kassia.debian.org: 587
+    klecker.debian.org: 587
     piatti.debian.org: 2025
+    zappa.debian.org: 587
   no_munin:
     - agnesi.debian.org
     - allegri.debian.org