X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=b893f6d45ba84bb3898975054649e4f56f2f578a;hb=61beac4d7c210c7fb8ff8a37fa825c4e517c260b;hp=214fcc930b6e944a0f8c251131764cb669c3bd41;hpb=2fdad4e426a6712b051ee39317f0c8c9bca48a54;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 214fcc930..b893f6d45 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -13,7 +13,6 @@ 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)
@@ -22,8 +21,8 @@ nameinfo:
   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)
@@ -44,7 +43,7 @@ nameinfo:
   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)
-  kokkonen.debian.org: November 13th, 1921 - October 1st, 1996)
+  kokkonen.debian.org: Joonas Kokkonen (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
@@ -62,9 +61,10 @@ nameinfo:
   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,27 +75,29 @@ 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)
-  quantz.debian.org: Johann Joachim Quantz (30 January 1697 ? 12 July 1773)
+  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)
+  rossini.debian.org: Gioachino Rossini (February 29th, 1792 - November 13th, 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)
+  salieri.debian.org: Antonio Salieri (August 18th, 1750 - May 7th, 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.
+  santoro.debian.org: Cláudio Santoro (November 23rd, 1919 - March 27th, 1989)
   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)
+  schuetz.debian.org: Heinrich Schütz (October 8th, 1585 - November 6th, 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)
-  soler.debian.org: Padre Antonio Soler (December 3, 1729 (baptized) - December 20, 1783)
+  soler.debian.org: Padre Antonio Soler (December 3rd, 1729 (baptized) - December 20th, 1783)
   sperger.debian.org: Johannes Matthias Sperger (March 23th, 1750 - May 13th, 1812)
   spohr.debian.org: Louis Spohr (April 5th, 1784 - October 22nd, 1859)
   spontini.debian.org: Gaspare Luigi Pacifico Spontini (November 14th, 1774 - January 24th, 1851)
@@ -103,7 +105,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)
+  traetta.debian.org: Tommaso Michele Francesco Saverio Traetta (March 30th, 1727 - April 6th, 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)
@@ -124,8 +126,7 @@ 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
@@ -135,7 +136,8 @@ services:
   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
@@ -145,23 +147,36 @@ 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
+    - reger.debian.org
     - spohr.debian.org
     - valente.debian.org
   apache2_security_mirror:
     - gluck.debian.org
     - lobos.debian.org
-    - raff.debian.org
     - saens.debian.org
+    - santoro.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
+    - santoro.debian.org
+    - wolkenstein.debian.org
   timeserver:
     - merikanto.debian.org
     - orff.debian.org
@@ -189,10 +204,8 @@ host_settings:
     - goedel.debian.org
     - goetz.debian.org
     - krenek.debian.org
-    - lafayette.debian.org
     - lebrun.debian.org
     - lucatelli.debian.org
-    - malo.debian.org
     - mayer.debian.org
     - mayr.debian.org
     - mundy.debian.org
@@ -208,19 +221,79 @@ host_settings:
     - vitry.debian.org
     - voltaire.debian.org
     - zandonai.debian.org
+    - zee.debian.org
   squeeze:
+    - alkman.debian.org
+    - arne.debian.org
+    - barber.debian.org
+    - beethoven.debian.org
+    - biber.debian.org
+    - brahms.debian.org
+    - busoni.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
-    - byrd.debian.org
+    - franck.debian.org
+    - geo1.debian.org
+    - geo2.debian.org
+    - geo3.debian.org
+    - gluck.debian.org
+    - heininen.debian.org
+    - kassia.debian.org
+    - kaufmann.debian.org
+    - krenek.debian.org
     - lamb.debian.org
+    - lindberg.debian.org
+    - lobos.debian.org
     - locke.debian.org
     - lotti.debian.org
+    - luchesi.debian.org
+    - merikanto.debian.org
+    - morricone.debian.org
+    - murphy.debian.org
+    - nono.debian.org
+    - pergolesi.debian.org
+    - pettersson.debian.org
+    - piatti.debian.org
+    - quantz.debian.org
+    - raff.debian.org
     - rautavaara.debian.org
-    - schuetz.debian.org
+    - reger.debian.org
+    - rem.debian.org
+    - respighi.debian.org
+    - ries.debian.org
+    - rietz.debian.org
+    - rossini.debian.org
+    - saens.debian.org
     - salieri.debian.org
-    - quantz.debian.org
+    - samosa.debian.org
+    - santoro.debian.org
+    - scelsi.debian.org
+    - schein.debian.org
+    - schuetz.debian.org
+    - schumann.debian.org
+    - senfl.debian.org
+    - sibelius.debian.org
+    - smetana.debian.org
+    - soler.debian.org
+    - spohr.debian.org
+    - stabile.debian.org
+    - steffani.debian.org
+    - tchaikovsky.debian.org
+    - traetta.debian.org
+    - unger.debian.org
+    - villa.debian.org
+    - vitry.debian.org
+    - widor.debian.org
+    - wieck.debian.org
   smarthost:
     abel.debian.org: mailout.debian.org
     agnesi.debian.org: mailout.debian.org
@@ -237,16 +310,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
     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
@@ -267,7 +339,6 @@ 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
@@ -298,7 +369,6 @@ host_settings:
     porpora.debian.org: mailout.debian.org
     poulenc.debian.org: mailout.debian.org
     praetorius.debian.org: mailout.debian.org
-    quantz.debian.org: mailout.debian.org
     raff.debian.org: mailout.debian.org
     rautavaara.debian.org: mailout.debian.org
     rem.debian.org: mailout.debian.org
@@ -309,6 +379,7 @@ host_settings:
     rossini.debian.org: mailout.debian.org
     saens.debian.org: mailout.debian.org
     salieri.debian.org: mailout.debian.org
+    santoro.debian.org: mailout.debian.org
     scelsi.debian.org: mailout.debian.org
     schein.debian.org: mailout.debian.org
     schroeder.debian.org: mailout.debian.org
@@ -331,7 +402,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
@@ -345,7 +415,11 @@ host_settings:
     - escher.debian.org
     - fano.debian.org
     - malo.debian.org
+  entropy_key:
+    - heininen.debian.org
+    - englund.debian.org
+    - rautavaara.debian.org
+    - salieri.debian.org
+    - widor.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"
----
-