X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=98cce623d79f02ff24a6a1b6553d814c4c9091ac;hb=6a74fcd797fb66c3fba4208a284e5c0f1be252b7;hp=241169d02387d0d17cfa17285874bc7215432af7;hpb=debb5cd897d70c9815c37821e3167bcf764bcb1c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 241169d02..98cce623d 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -15,31 +15,48 @@ 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)
+  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)
   draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700)
   duarte.debian.org: Leonora Duarte (July 28th, 1610 - 1678)
+  eder.debian.org: Helmut Eder (December 26th, 1916 - February 8th, 2005)
+  elgar.debian.org: Edward Elgar (1857 - 1934)
   englund.debian.org: Sven Einar Englund (June 17th, 1916 - June 27th, 1999)
+  eysler.debian.org: Edmund Samuel Eysler (March 12th, 1874 - October 4th, 1949)
   fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961)
   fasch.debian.org: Johann Friedrich Fasch (1688 - 1758)
   field.debian.org: John Field (1782 - 1837)
   finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
   franck.debian.org: Melchior Franck (1579 - June 1st, 1639)
   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)
   grieg.debian.org: Edvard Hagerup Grieg (June 15th, 1843 - September 4th, 1907)
   handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759)
+  harris.debian.org: Sir William Henry Harris (March 28th, 1883 - September 6th, 1973)
+  hartmann.debian.org: Karl Amadeus Hartmann (August 2nd, 1905 - December 5th, 1963)
+  hasse.debian.org: Johann Adolph Hasse (March 25th, 1699 - December 16th, 1783)
+  hebden.debian.org: John Hebden (1712 - 1765)
+  henze.debian.org: Hans Werner Henze (July 1st, 1926)
   heininen.debian.org: Paavo Heininen (January 13th, 1938)
+  hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011)
   holter.debian.org: Iver Holter (December 13th, 1850 - January 27th, 1941)
+  jenkins.debian.org: John Jenkins (1592 - 1678)
   kassia.debian.org: Kassia (between 805 and 810 - bef. 867)
   kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
@@ -56,7 +73,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)
@@ -106,16 +122,18 @@ nameinfo:
   tartini.debian.org: Giuseppe Tartini (April 8th, 1692 - February 26th, 1770)
   tchaikovsky.debian.org: Pyotr Ilyich Tchaikovsky (Пётр Ильич Чайковский) (May 7th, 1840 - November 6th, 1893)
   traetta.debian.org: Tommaso Michele Francesco Saverio Traetta (March 30th, 1727 - April 6th, 1779)
+  tye.debian.org: Christopher Tye (c.1505 - 1573)
   unger.debian.org: Caroline Unger (October 28th, 1803 - March 23th, 1877)
   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)
   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]"
@@ -133,10 +151,9 @@ services:
   extranrpeclient:
     - orff.debian.org
   packagesmaster: powell.debian.org
-  packagesqamaster: master.debian.org
+  packagesqamaster: quantz.debian.org
   puppetmaster: handel.debian.org
-  qamaster: merkel.debian.org
-  rtmaster: 
+  rtmaster:
     - reger.debian.org
 host_settings:
   heavy_exim:
@@ -146,11 +163,9 @@ host_settings:
     - draghi.debian.org
     - franck.debian.org
     - grieg.debian.org
-    - klecker.debian.org
     - kokkonen.debian.org
     - master.debian.org
     - merikanto.debian.org
-    - merkel.debian.org
     - morricone.debian.org
     - nono.debian.org
     - powell.debian.org
@@ -172,11 +187,17 @@ host_settings:
     - bellini.debian.org
     - englund.debian.org
     - gluck.debian.org
-    - klecker.debian.org
     - kokkonen.debian.org
     - senfl.debian.org
     - santoro.debian.org
-    - wolkenstein.debian.org
+  'apache2_ftp-upcoming_mirror':
+    - rietz.debian.org
+    - kassia.debian.org
+    - klecker.debian.org
+    - merikanto.debian.org
+  apache2_backports_mirror:
+    - englund.debian.org
+    - morricone.debian.org
   timeserver:
     - merikanto.debian.org
     - orff.debian.org
@@ -197,12 +218,18 @@ host_settings:
     - brahms.debian.org
     - caballero.debian.org
     - corelli.debian.org
+    - eysler.debian.org
     - fano.debian.org
     - fasch.debian.org
     - field.debian.org
     - finzi.debian.org
     - goedel.debian.org
     - goetz.debian.org
+    - hartmann.debian.org
+    - hasse.debian.org
+    - hebden.debian.org
+    - henze.debian.org
+    - hoiby.debian.org
     - krenek.debian.org
     - lebrun.debian.org
     - lucatelli.debian.org
@@ -219,68 +246,134 @@ host_settings:
     - schroeder.debian.org
     - spontini.debian.org
     - vitry.debian.org
-    - voltaire.debian.org
     - zandonai.debian.org
+    - zappa.debian.org
+    - zemlinsky.debian.org
     - zee.debian.org
-  squeeze:
-    - alkman.debian.org
-    - arne.debian.org
-    - barber.debian.org
-    - beethoven.debian.org
-    - biber.debian.org
-    - brahms.debian.org
-    - byrd.debian.org
-    - chopin.debian.org
-    - cilea.debian.org
-    - danzi.debian.org
-    - dijkstra.debian.org
-    - duarte.debian.org
-    - englund.debian.org
-    - fano.debian.org
-    - fasch.debian.org
-    - field.debian.org
-    - finzi.debian.org
-    - franck.debian.org
-    - geo1.debian.org
-    - geo2.debian.org
-    - geo3.debian.org
-    - heininen.debian.org
-    - kassia.debian.org
-    - kaufmann.debian.org
-    - krenek.debian.org
-    - lamb.debian.org
-    - lindberg.debian.org
-    - locke.debian.org
-    - lotti.debian.org
-    - luchesi.debian.org
-    - merikanto.debian.org
-    - morricone.debian.org
-    - murphy.debian.org
-    - nono.debian.org
-    - piatti.debian.org
-    - quantz.debian.org
-    - raff.debian.org
-    - rautavaara.debian.org
-    - reger.debian.org
-    - rem.debian.org
-    - ries.debian.org
-    - rietz.debian.org
-    - rossini.debian.org
-    - salieri.debian.org
-    - samosa.debian.org
-    - santoro.debian.org
-    - scelsi.debian.org
-    - schein.debian.org
-    - schuetz.debian.org
-    - sibelius.debian.org
-    - smetana.debian.org
-    - spohr.debian.org
-    - tchaikovsky.debian.org
-    - traetta.debian.org
-    - unger.debian.org
-    - vitry.debian.org
-    - widor.debian.org
-    - wieck.debian.org
+  #wheezy:
+  #  - harris.debian.org
+  #  - hartmann.debian.org
+  #  - hasse.debian.org
+  #  - hebden.debian.org
+  #  - henze.debian.org
+  #  - hoiby.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
+  #  - diamond.debian.org
+  #  - dijkstra.debian.org
+  #  - draghi.debian.org
+  #  - duarte.debian.org
+  #  - dukas.debian.org
+  #  - eder.debian.org
+  #  - elgar.debian.org
+  #  - englund.debian.org
+  #  - eysler.debian.org
+  #  - fano.debian.org
+  #  - fasch.debian.org
+  #  - field.debian.org
+  #  - finzi.debian.org
+  #  - franck.debian.org
+  #  - geo1.debian.org
+  #  - geo2.debian.org
+  #  - geo3.debian.org
+  #  - glinka.debian.org
+  #  - gluck.debian.org
+  #  - gombert.debian.org
+  #  - grieg.debian.org
+  #  - handel.debian.org
+  #  - heininen.debian.org
+  #  - holter.debian.org
+  #  - jenkins.debian.org
+  #  - kassia.debian.org
+  #  - kaufmann.debian.org
+  #  - kokkonen.debian.org
+  #  - krenek.debian.org
+  #  - lamb.debian.org
+  #  - lebrun.debian.org
+  #  - lindberg.debian.org
+  #  - lobos.debian.org
+  #  - locke.debian.org
+  #  - lotti.debian.org
+  #  - 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
+  #  - paganini.debian.org
+  #  - pescetti.debian.org
+  #  - pergolesi.debian.org
+  #  - pettersson.debian.org
+  #  - piatti.debian.org
+  #  - porpora.debian.org
+  #  - poulenc.debian.org
+  #  - praetorius.debian.org
+  #  - quantz.debian.org
+  #  - raff.debian.org
+  #  - rautavaara.debian.org
+  #  - ravel.debian.org
+  #  - reger.debian.org
+  #  - rem.debian.org
+  #  - respighi.debian.org
+  #  - ries.debian.org
+  #  - rietz.debian.org
+  #  - rore.debian.org
+  #  - rossini.debian.org
+  #  - saens.debian.org
+  #  - salieri.debian.org
+  #  - samosa.debian.org
+  #  - santoro.debian.org
+  #  - scelsi.debian.org
+  #  - schein.debian.org
+  #  - schroeder.debian.org
+  #  - schuetz.debian.org
+  #  - schumann.debian.org
+  #  - senfl.debian.org
+  #  - sibelius.debian.org
+  #  - smetana.debian.org
+  #  - soler.debian.org
+  #  - sperger.debian.org
+  #  - spohr.debian.org
+  #  - spontini.debian.org
+  #  - stabile.debian.org
+  #  - steffani.debian.org
+  #  - tchaikovsky.debian.org
+  #  - traetta.debian.org
+  #  - tye.debian.org
+  #  - unger.debian.org
+  #  - villa.debian.org
+  #  - vitry.debian.org
+  #  - vivaldi.debian.org
+  #  - widor.debian.org
+  #  - wieck.debian.org
+  #  - wolkenstein.debian.org
+  #  - zandonai.debian.org
+  #  - zelenka.debian.org
   smarthost:
     abel.debian.org: mailout.debian.org
     agnesi.debian.org: mailout.debian.org
@@ -298,18 +391,25 @@ 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
+    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
     duarte.debian.org: mailout.debian.org
+    eder.debian.org: mailout.debian.org
+    elgar.debian.org: mailout.debian.org
     englund.debian.org: mailout.debian.org
     escher.debian.org: mailout.debian.org
+    eysler.debian.org: mailout.debian.org
     fano.debian.org: mailout.debian.org
     fasch.debian.org: mailout.debian.org
     field.debian.org: mailout.debian.org
@@ -318,14 +418,24 @@ host_settings:
     geo1.debian.org: mailout.debian.org
     geo2.debian.org: mailout.debian.org
     geo3.debian.org: mailout.debian.org
+    glinka.debian.org: mailout.debian.org
     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
+    harris.debian.org: mailout.debian.org
+    hartmann.debian.org: mailout.debian.org
+    hasse.debian.org: mailout.debian.org
+    hebden.debian.org: mailout.debian.org
     heininen.debian.org: mailout.debian.org
+    henze.debian.org: mailout.debian.org
+    hoiby.debian.org: mailout.debian.org
     holter.debian.org: mailout.debian.org
+    jenkins.debian.org: mailout.debian.org
     kassia.debian.org: mailout.debian.org
     kaufmann.debian.org: mailout.debian.org
+    klecker.debian.org: mailout.debian.org
     krenek.debian.org: mailout.debian.org
     lamb.debian.org: mailout.debian.org
     lafayette.debian.org: mailout.debian.org
@@ -386,16 +496,19 @@ host_settings:
     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
+    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