X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=9fd4495fe8b0502ca02752f4bc7c566d2f37c734;hb=2fbe564870cb94327096af0d7a0b4b06d4199b24;hp=bc4fc1341ad55985a5922fa6aa12c282b669aa03;hpb=a70cf7e598884a1e8789ba2ea5b0c2939e902de4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index bc4fc1341..9fd4495fe 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -13,17 +13,16 @@ nameinfo:
   arne.debian.org: Thomas Augustine Arne (1710 - 1778)
   arnold.debian.org: Malcolm Henry Arnold (1921 - 2006)
   barber.debian.org: Samuel Barber (March 9th, 1910 - January 23rd, 1981)
-  bartok.debian.org: Béla Viktor János Bartók (March 25th, 1881 - September 26th, 1945)
   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)
   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)
-  carver.debian.org: Robert Carver (ca.1485 - ca.1570)
+  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)
-  cimarosa.debian.org: Domenico Cimarosa (17 December 1749 - 11 January 1801)
-  corelli.debian.org: Arcangelo Corelli (February 17th, 1653 – January 8th, 1713)
+  corelli.debian.org: Arcangelo Corelli (February 17th, 1653 - January 8th, 1713)
+  danzi.debian.org: Franz Ignaz Danzi (June 15th, 1763 - April 13th, 1826)
   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)
@@ -33,7 +32,7 @@ nameinfo:
   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)
+  gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 - July 10th, 1690)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
   goedel.debian.org: Kurt Gödel (April 28th, 1906 - January 14th, 1978)
   goetz.debian.org: Hermann Gustav Goetz (December 7th, 1840 - December 3rd, 1876)
@@ -46,25 +45,26 @@ nameinfo:
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
   kokkonen.debian.org: November 13th, 1921 - October 1st, 1996)
   krenek.debian.org: Ernst Krenek (August 23rd, 1900 - December 22nd, 1991)
+  lamb.debian.org: John David Lamb (b. 1935)
   lafayette.debian.org: Eugenie Lafayette
   lebrun.debian.org: Francesca Lebrun (March 24th, 1756 - May 14th, 1791)
   lindberg.debian.org: Magnus Lindberg (June 27th, 1958)
   liszt.debian.org: Franz Liszt (October 22nd, 1811 - July 31st, 1886)
+  locke.debian.org: Matthew Locke (ca. 1621 - 1677)
+  lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740)
   luchesi.debian.org: Andrea Luca Luchesi (May 23rd, 1741 - March 21st, 1801)
-  mahler.debian.org: Gustav Mahler (July 7th, 1860 - May 18th, 1911)
   mayer.debian.org: John Mayer (October 28th, 1930 - March 9th, 2004)
   mayr.debian.org: Johann(es) Simon Mayr (June 14th, 1763 - December 2nd, 1845)
-  mendes.debian.org: Manuel Mendes (1547 - September 24th, 1605)
   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)
-  monteverdi.debian.org: Claudio Giovanni Antonio Monteverdi (May 15th, 1567 - November 29, 1643)
   morricone.debian.org: Ennio Morricone (November 10th, 1928 - )
   mundy.debian.org: William Mundy (c. 1529 - 1591)
   nielsen.debian.org: Carl August Nielsen (June 9th, 1865 - October 3rd, 1931)
+  nono.debian.org: Luigi Nono (January 29, 1924 - May 8, 1990)
   orff.debian.org: Carl Orff (July 10th, 1895 - March 29th, 1982)
   paer.debian.org: Ferdinando Paër (July 1st, 1771 - May 3rd, 1839)
-  paganini.debian.org: Niccolò Paganini (October 27th, 1782 – May 27th, 1840)
+  paganini.debian.org: Niccolò Paganini (October 27th, 1782 - May 27th, 1840)
   penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1st, 1528)
   pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736)
   peri.debian.org: Jacopo Peri (August 20th, 1561 - August 12th, 1633)
@@ -75,20 +75,24 @@ nameinfo:
   poulenc.debian.org: Francis Jean Marcel Poulenc (January 7, 1899 - January 30, 1963)
   powell.debian.org: Andrew Powell (b. April 18th, 1949)
   praetorius.debian.org: Hieronymus Praetorius (August 10th, 1560 - January 27th, 1629)
-  puccini.debian.org: Giacomo Antonio Domenico Michele Secondo Maria Puccini (December 22nd, 1858 - November 29th, 1924)
+  quantz.debian.org: Johann Joachim Quantz (January 30th, 1697 ? July 12th 1773)
   raff.debian.org: Joseph Joachim Raff (May 27th, 1822 - June 24th or 25th, 1882)
   rautavaara.debian.org: Einojuhani Rautavaara (born October 9th, 1928)
   ravel.debian.org: Joseph-Maurice Ravel (March 7th, 1875 - December 28th, 1937)
   respighi.debian.org: Ottorino Respighi (July 9th, 1879 - April 18th, 1936)
-  ries.debian.org: Franz Ries (April 7th, 1846 – January 20th, 1932)
+  reger.debian.org: Johann Baptist Joseph Maximilian Reger (March 19, 1873 - May 11th, 1916)
+  ries.debian.org: Franz Ries (April 7th, 1846 - January 20th, 1932)
   rietz.debian.org: August Wilhelm Julius Rietz (December 28th, 1812 - September 12th, 1877)
   rore.debian.org: Cipriano de Rore (occasionally Cypriano) (1515 or 1516 - between September 11 and September 20, 1565)
+  rossini.debian.org: Gioachino Rossini (February 29, 1792 - November 13, 1868)
   saens.debian.org: Charles-Camille Saint-Saëns  (October 9th, 1835 - December 16th, 1921)
+  salieri.debian.org: Antonio Salieri (Legnago, 18 August 1750 - Vienna, 7 May 1825)
   samosa.debian.org: The samosa is a stuffed pastry and a popular snack in South Asia, Southeast Asia, Central Asia, the Arabian Peninsula, throughout the Mediterranean (Greece), Southwest Asia, the Horn of Africa and North Africa.
   scelsi.debian.org: Giacinto Scelsi (January 8th, 1905 - August 9th, 1988)
   schein.debian.org: Johann Hermann Schein (January 20th, 1586 - November 19th, 1630)
   schroeder.debian.org: Hermann Schroeder (March 26th, 1904 - October 7th, 1984)
   schumann.debian.org: Robert Alexander Schumann (June 8th, 1810 - July 29th, 1856)
+  schuetz.debian.org: Heinrich Schütz (October 8 (JC), 1585 - November 6, 1672)
   senfl.debian.org: Ludwig Senfl (~1490 - ~1543)
   sibelius.debian.org: Jean Sibelius (December 8th, 1865 - September 20th, 1957)
   smetana.debian.org: Bedřich Smetana (March 2nd, 1824 - May 12th, 1884)
@@ -100,6 +104,7 @@ nameinfo:
   steffani.debian.org: Agostino Steffani (July 25th, 1653 - February 12th, 1728)
   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 (30 March 1727 - 6 April 1779)
   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)
@@ -120,18 +125,18 @@ services:
   dbmaster:
     - draghi.debian.org
   mailrelay:
-    - draghi.debian.org
-    - spohr.debian.org
+    - kokkonen.debian.org
     - merikanto.debian.org
   muninmaster: spohr.debian.org
   nagiosmaster: tchaikovsky.debian.org
   extranrpeclient:
-    - draghi.debian.org
+    - orff.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
   puppetmaster: handel.debian.org
   qamaster: merkel.debian.org
-  rtmaster: spohr.debian.org
+  rtmaster: 
+    - reger.debian.org
 host_settings:
   heavy_exim:
     - bellini.debian.org
@@ -141,29 +146,48 @@ host_settings:
     - 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
+    - quantz.debian.org
     - ravel.debian.org
-    - ries.debian.org
+    - reger.debian.org
     - spohr.debian.org
     - valente.debian.org
   apache2_security_mirror:
     - gluck.debian.org
     - lobos.debian.org
-    - raff.debian.org
     - saens.debian.org
     - schein.debian.org
     - steffani.debian.org
     - villa.debian.org
     - wieck.debian.org
+  apache2_www_mirror:
+    - bellini.debian.org
+    - englund.debian.org
+    - gluck.debian.org
+    - klecker.debian.org
+    - kokkonen.debian.org
+    - senfl.debian.org
+    - wolkenstein.debian.org
+  timeserver:
+    - merikanto.debian.org
+    - orff.debian.org
+    - ravel.debian.org
+    - busoni.debian.org
   buildd:
+    - alain.debian.org
     - alkman.debian.org
+    - alwyn.debian.org
     - ancina.debian.org
+    - antheil.debian.org
     - arcadelt.debian.org
     - argento.debian.org
+    - arnold.debian.org
     - ball.debian.org
     - barber.debian.org
     - biber.debian.org
@@ -176,6 +200,7 @@ host_settings:
     - finzi.debian.org
     - goedel.debian.org
     - goetz.debian.org
+    - krenek.debian.org
     - lafayette.debian.org
     - lebrun.debian.org
     - lucatelli.debian.org
@@ -189,18 +214,34 @@ host_settings:
     - porpora.debian.org
     - poulenc.debian.org
     - praetorius.debian.org
-    - puccini.debian.org
-    - purcell.debian.org
     - rem.debian.org
     - schroeder.debian.org
     - spontini.debian.org
+    - vitry.debian.org
     - voltaire.debian.org
     - zandonai.debian.org
   squeeze:
+    - arne.debian.org
+    - byrd.debian.org
+    - danzi.debian.org
     - fano.debian.org
     - fasch.debian.org
     - field.debian.org
     - finzi.debian.org
+    - kassia.debian.org
+    - lamb.debian.org
+    - locke.debian.org
+    - lotti.debian.org
+    - nono.debian.org
+    - quantz.debian.org
+    - raff.debian.org
+    - rautavaara.debian.org
+    - reger.debian.org
+    - rem.debian.org
+    - salieri.debian.org
+    - schuetz.debian.org
+    - sibelius.debian.org
+    - spohr.debian.org
   smarthost:
     abel.debian.org: mailout.debian.org
     agnesi.debian.org: mailout.debian.org
@@ -217,16 +258,15 @@ host_settings:
     arnold.debian.org: mailout.debian.org
     ball.debian.org: mailout.debian.org
     barber.debian.org: mailout.debian.org
-    bartok.debian.org: mailout.debian.org
     beethoven.debian.org: mailout.debian.org
     biber.debian.org: mailout.debian.org
     brahms.debian.org: mailout.debian.org
+    byrd.debian.org: mailout.debian.org
     caballero.debian.org: mailout.debian.org
-    carver.debian.org: mailout.debian.org
     cilea.debian.org: mailout.debian.org
-    cimarosa.debian.org: mailout.debian.org
     corelli.debian.org: mailout.debian.org
     crest.debian.org: mailout.debian.org
+    danzi.debian.org: mailout.debian.org
     dijkstra.debian.org: mailout.debian.org
     duarte.debian.org: mailout.debian.org
     englund.debian.org: mailout.debian.org
@@ -247,23 +287,21 @@ host_settings:
     holter.debian.org: mailout.debian.org
     kassia.debian.org: mailout.debian.org
     kaufmann.debian.org: mailout.debian.org
-    kokkonen.debian.org: mailout.debian.org
     krenek.debian.org: mailout.debian.org
+    lamb.debian.org: mailout.debian.org
     lafayette.debian.org: mailout.debian.org
     lebrun.debian.org: mailout.debian.org
     leisner.debian.org: mailout.debian.org
     lindberg.debian.org: mailout.debian.org
     lobos.debian.org: mailout.debian.org
+    locke.debian.org: mailout.debian.org
+    lotti.debian.org: mailout.debian.org
     lucatelli.debian.org: mailout.debian.org
     luchesi.debian.org: mailout.debian.org
-    mahler.debian.org: mailout.debian.org
     malo.debian.org: mailout.debian.org
     mayer.debian.org: mailout.debian.org
     mayr.debian.org: mailout.debian.org
-    mendes.debian.org: mailout.debian.org
     merulo.debian.org: mailout.debian.org
-    monteverdi.debian.org: mailout.debian.org
-    morales.debian.org: mailout.debian.org
     mundy.debian.org: mailout.debian.org
     murphy.debian.org: mailout.debian.org
     nielsen.debian.org: mailout.debian.org
@@ -279,19 +317,21 @@ host_settings:
     porpora.debian.org: mailout.debian.org
     poulenc.debian.org: mailout.debian.org
     praetorius.debian.org: mailout.debian.org
-    puccini.debian.org: mailout.debian.org
-    purcell.debian.org: mailout.debian.org
     raff.debian.org: mailout.debian.org
     rautavaara.debian.org: mailout.debian.org
     rem.debian.org: mailout.debian.org
     respighi.debian.org: mailout.debian.org
+    ries.debian.org: mailout.debian.org
     rietz.debian.org: mailout.debian.org
     rore.debian.org: mailout.debian.org
+    rossini.debian.org: mailout.debian.org
     saens.debian.org: mailout.debian.org
+    salieri.debian.org: mailout.debian.org
     scelsi.debian.org: mailout.debian.org
     schein.debian.org: mailout.debian.org
     schroeder.debian.org: mailout.debian.org
     schumann.debian.org: mailout.debian.org
+    schuetz.debian.org: mailout.debian.org
     senfl.debian.org: mailout.debian.org
     sibelius.debian.org: mailout.debian.org
     smetana.debian.org: mailout.debian.org
@@ -301,6 +341,7 @@ host_settings:
     stabile.debian.org: mailout.debian.org
     steffani.debian.org: mailout.debian.org
     tchaikovsky.debian.org: mailout.debian.org
+    traetta.debian.org: mailout.debian.org
     unger.debian.org: mailout.debian.org
     villa.debian.org: mailout.debian.org
     vitry.debian.org: mailout.debian.org
@@ -308,7 +349,6 @@ host_settings:
     voltaire.debian.org: mailout.debian.org
     widor.debian.org: mailout.debian.org
     wieck.debian.org: mailout.debian.org
-    wolkenstein.debian.org: mailout.debian.org
     zandonai.debian.org: mailout.debian.org
     zee.debian.org: mailout.debian.org
     zelenka.debian.org: mailout.debian.org
@@ -319,16 +359,9 @@ host_settings:
   no_munin:
     - agnesi.debian.org
     - allegri.debian.org
-    - byrd.debian.org
-    - carver.debian.org
     - escher.debian.org
     - fano.debian.org
-    - logtest01.debian.org
-    - mahler.debian.org
     - malo.debian.org
-    - mendes.debian.org
-    - monteverdi.debian.org
-    - morales.debian.org
 #  reservedaddrs:
 #    ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
 ---