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

[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 cdeebd2672619b523aa9e9e0d617bf5d82a9738a..1c557c5b541dcd4658a011375f66942caacaf3bd 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)
@@ -27,6 +28,7 @@ nameinfo:
   dijkstra.debian.org: Lowell Dijkstra (b.1952)
   draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700)
   duarte.debian.org: Leonora Duarte (July 28th, 1610 - 1678)
+  elgar.debian.org: Edward Elgar (1857 - 1934)
   englund.debian.org: Sven Einar Englund (June 17th, 1916 - June 27th, 1999)
   fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961)
   fasch.debian.org: Johann Friedrich Fasch (1688 - 1758)
@@ -36,6 +38,7 @@ nameinfo:
   gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 - July 10th, 1690)
   glinka.debian.org: Mikhail Ivanovich Glinka (1804 - 1857)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
+  gombert.debian.org: Nicolas Gombert (c. 1495 – c. 1560)
   dukas.debian.org: Paul Dukas (1865 - 1935)
   goedel.debian.org: Kurt Gödel (April 28th, 1906 - January 14th, 1978)
   goetz.debian.org: Hermann Gustav Goetz (December 7th, 1840 - December 3rd, 1876)
@@ -59,7 +62,6 @@ nameinfo:
   mayer.debian.org: John Mayer (October 28th, 1930 - March 9th, 2004)
   mayr.debian.org: Johann(es) Simon Mayr (June 14th, 1763 - December 2nd, 1845)
   merikanto.debian.org: Oskar Merikanto (August 5th, 1868 - February 17th, 1924)
-  merkel.debian.org: Gustav (Adolf) Merkel (November 12th, 1827 - October 30th, 1885)
   merulo.debian.org: Claudio Merulo (April 8th, 1533 - May 4th, 1604)
   morricone.debian.org: Ennio Morricone (November 10th, 1928 - )
   mundy.debian.org: William Mundy (c. 1529 - 1591)
@@ -114,7 +116,6 @@ nameinfo:
   valente.debian.org: Vincenzo Valente (February 21st, 1855 - September 6th, 1921)
   vitry.debian.org: Philippe de Vitry (October 31st, 1291 - June 9th, 1361)
   vivaldi.debian.org: Antonio Lucio Vivaldi (March 4th, 1678 - July 28th, 1741)
-  voltaire.debian.org: François-Marie Arouet (Voltaire) (November 21st, 1694 - May 30th, 1778)
   widor.debian.org: Charles-Marie Jean Albert Widor (February 21st, 1844 - March 12th, 1937)
   wieck.debian.org: Clara Josephine Wieck (September 13th, 1819 - May 20th, 1896)
   wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
@@ -139,7 +140,6 @@ services:
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
   puppetmaster: handel.debian.org
-  qamaster: merkel.debian.org
   rtmaster: 
     - reger.debian.org
 host_settings:
@@ -154,7 +154,6 @@ host_settings:
     - kokkonen.debian.org
     - master.debian.org
     - merikanto.debian.org
-    - merkel.debian.org
     - morricone.debian.org
     - nono.debian.org
     - powell.debian.org
@@ -180,8 +179,10 @@ host_settings:
     - kokkonen.debian.org
     - senfl.debian.org
     - santoro.debian.org
-    # www-master is handled differently.
-    # - wolkenstein.debian.org
+  'apache2_ftp-upcoming_mirror':
+    - rietz.debian.org
+    - kassia.debian.org
+    - merikanto.debian.org
   apache2_backports_mirror:
     - englund.debian.org
     - morricone.debian.org
@@ -227,20 +228,29 @@ host_settings:
     - schroeder.debian.org
     - spontini.debian.org
     - vitry.debian.org
-    - voltaire.debian.org
     - zandonai.debian.org
     - zee.debian.org
   squeeze:
+    - abel.debian.org
+    - agricola.debian.org
+    - alain.debian.org
     - alkman.debian.org
+    - alwyn.debian.org
+    - antheil.debian.org
+    - arcadelt.debian.org
+    - argento.debian.org
     - arne.debian.org
+    - arnold.debian.org
     - ball.debian.org
     - barber.debian.org
     - beethoven.debian.org
     - bellini.debian.org
+    - berlioz.debian.org
     - biber.debian.org
     - brahms.debian.org
     - busoni.debian.org
     - byrd.debian.org
+    - caballero.debian.org
     - chopin.debian.org
     - cilea.debian.org
     - danzi.debian.org
@@ -249,6 +259,7 @@ host_settings:
     - draghi.debian.org
     - duarte.debian.org
     - dukas.debian.org
+    - elgar.debian.org
     - englund.debian.org
     - fano.debian.org
     - fasch.debian.org
@@ -260,6 +271,7 @@ host_settings:
     - geo3.debian.org
     - glinka.debian.org
     - gluck.debian.org
+    - gombert.debian.org
     - grieg.debian.org
     - handel.debian.org
     - heininen.debian.org
@@ -277,7 +289,9 @@ host_settings:
     - luchesi.debian.org
     - master.debian.org
     - merikanto.debian.org
+    - merulo.debian.org
     - morricone.debian.org
+    - mundy.debian.org
     - murphy.debian.org
     - nono.debian.org
     - orff.debian.org
@@ -324,7 +338,7 @@ host_settings:
     - unger.debian.org
     - villa.debian.org
     - vitry.debian.org
-    - voltaire.debian.org
+    - vivaldi.debian.org
     - widor.debian.org
     - wieck.debian.org
     - zandonai.debian.org
@@ -346,6 +360,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
@@ -357,7 +372,7 @@ host_settings:
     diamond.debian.org: mailout.debian.org
     dijkstra.debian.org: mailout.debian.org
     duarte.debian.org: mailout.debian.org
-    dukas.debian.org: mailout.debian.org
+    elgar.debian.org: mailout.debian.org
     englund.debian.org: mailout.debian.org
     escher.debian.org: mailout.debian.org
     fano.debian.org: mailout.debian.org
@@ -372,6 +387,7 @@ host_settings:
     gluck.debian.org: mailout.debian.org
     goedel.debian.org: mailout.debian.org
     goetz.debian.org: mailout.debian.org
+    gombert.debian.org: mailout.debian.org
     handel.debian.org: mailout.debian.org
     heininen.debian.org: mailout.debian.org
     holter.debian.org: mailout.debian.org
@@ -433,12 +449,10 @@ host_settings:
     steffani.debian.org: mailout.debian.org
     tchaikovsky.debian.org: mailout.debian.org
     traetta.debian.org: mailout.debian.org
-    tye.debian.org: mailout.debian.org
     unger.debian.org: mailout.debian.org
     villa.debian.org: mailout.debian.org
     vitry.debian.org: mailout.debian.org
     vivaldi.debian.org: mailout.debian.org
-    voltaire.debian.org: mailout.debian.org
     widor.debian.org: mailout.debian.org
     wieck.debian.org: mailout.debian.org
     zandonai.debian.org: mailout.debian.org