X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=8aec035575b6a7937fe3f960a9c18d8fc60ff2ce;hb=4326b0a78553bfe9696c10f1a69e1316acd23802;hp=62f3945df031910b3351bea6e0dbc09454c1a9eb;hpb=b09a121ee23e25ac30cf87b8c19af2cf87cd321d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 62f3945df..8aec03557 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -1,11 +1,12 @@
 ---
 nameinfo:
+  aagaard.debian.org: Thorvald Aagaard (June 8th, 1877 - March 22nd, 1937)
   abel.debian.org: Carl Friedrich Abel (1723 - 1787)
+  acker.debian.org: Dieter Acker (November 3rd, 1940 - May 27th, 2006)
   adayevskaya.debian.org: Ella Georgiyevna Adayevskaya (February, 22nd 1846 [O.S. February 10th] - July 26th, 1926)
   antheil.debian.org: George Antheil (1900 - 1959)
   arnold.debian.org: Malcolm Henry Arnold (1921 - 2006)
   asachi.debian.org: Elena Asachi (1789 - 1877)
-  babin.debian.org: Stanley Babin (1932 - 2010)
   barriere.debian.org: Jean-Baptiste Barrière (May 2nd, 1707 - June 6th, 1747)
   beach.debian.org: Amy Marcy Cheney Beach (September 5th, 1867 - December 27th, 1944)
   beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827)
@@ -15,6 +16,7 @@ nameinfo:
   busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
   buxtehude.debian.org: Dieterich Buxtehude (c. 1637 to 1639 - May 9th, 1707)
   byrd.debian.org: William Byrd (1543 - July 4th, 1623)
+  casulana.debian.org: Maddalena Casulana (c. 1544 - c. 1590)
   clementi.debian.org: Muzio Clementi (January 23rd, 1752 - March 10th, 1832)
   coccia.debian.org: Maria Rosa Coccia (January 4th, 1759 - November 1833)
   czerny.debian.org: Carl Czerny (February 21st, 1791 - July 15th, 1857)
@@ -26,28 +28,25 @@ nameinfo:
   donizetti.debian.org: Gaetano Donizetti (November 29th, 1797 - April 8th, 1848)
   draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700)
   eberlin.debian.org: Johann Ernst Eberlin (March 1702 27th - June 19th, 1762)
-  etler.debian.org: Alvin Derald Etler (February 19th, 1913 - June 13th, 1973)
+  eller.debian.org: Heino Eller (March 7th, 1887 - June 16th, 1970)
   elgar.debian.org: Edward Elgar (1857 - 1934)
   falla.debian.org: Manuel de Falla y Matheu (November 23rd, 1876 - November 14th, 1946)
   fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961)
   fasolo.debian.org: Giovanni Battista Fasolo, O.F.M. (ca. 1598 - after 1664)
   fayrfax.debian.org: Robert Fayrfax (April 23rd, 1464 - October 24th, 1521)
-  fede.debian.org: Johannes Fedé (c. 1415 - 1477?)
   fils.debian.org: Anton Fils (September 22nd, 1733 (baptized) - March 14th, 1760 (buried))
   finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
   fischer.debian.org: Johann Caspar Ferdinand Fischer (September 9th, 1656 - August 27th, 1746)
-  franck.debian.org: Melchior Franck (1579 - June 1st, 1639)
   gideon.debian.org: Miriam Gideon (October 23rd, 1906 - June 18th, 1996)
   gigault.debian.org: Nicolas Gigault (ca. 1627 - August 20th, 1707)
-  glinka.debian.org: Mikhail Ivanovich Glinka (1804 - 1857)
   gombert.debian.org: Nicolas Gombert (c. 1495 - c. 1560)
+  gretchaninov: Alexander Tikhonovich Gretchaninov (October 25th, 1864 - January 3rd, 1956)
   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)
   henze.debian.org: Hans Werner Henze (July 1st, 1926 - October 27th, 2012)
   hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011)
-  jenko.debian.org: Davorin Jenko (November 9th, 1835 - November 25th. 1914)
   jerea.debian.org: Hilda Jerea (March 17th, 1916 - May 14th, 1980)
   kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
@@ -55,6 +54,7 @@ nameinfo:
   lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740)
   lully.debian.org: Jean-Baptiste de Lully (November 28th, 1632 - March 22nd, 1687)
   mailly.debian.org: Alphonse Jean Ernest Mailly (November 27th, 1833 - January 10th, 1918)
+  melartin.debian.org: Erkki Melartin (February 7th, 1875 - February 14th, 1937)
   menotti.debian.org: Gian Carlo Menotti (July 7th, 1911 - February 1st, 2007)
   manziarly.debian.org: Marcelle de Manziarly (October 1st/13th, 1899 -  May 12th, 1989)
   mekeel.debian.org: Joyce Mekeel (July 6th, 1931 - Dec 29th, 1997)
@@ -62,7 +62,7 @@ nameinfo:
   minkus.debian.org: Ludwig Minkus (March 23rd 1826 - December 7th, 1917)
   muffat.debian.org: George Muffat (June 1st, 1653 - February 23rd, 1704)
   nono.debian.org: Luigi Nono (January 29th, 1924 - May 8th, 1990)
-  oyens.debian.org: Tera de Marez Oyens (August 5th, 1932 - August 29th, 1996)
+  olin.debian.org: Elisabeth Olin (December 1740 - March 26th, 1828)
   paradis.debian.org: Maria Theresia Paradis (May 15th, 1759 - February 1st, 1824)
   partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
   pejacevic: Dora Pejačević (September 10th, 1885 - March 5th, 1923)
@@ -76,16 +76,15 @@ nameinfo:
   plummer.debian.org: John Plummer (c. 1410 - c. 1483)
   porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
   porta.debian.org: Giovanni Porta (c. 1675 - 21 June 1755)
-  poulenc.debian.org: Francis Jean Marcel Poulenc (January 7th, 1899 - January 30th, 1963)
-  powell.debian.org: Andrew Powell (b. April 18th, 1949)
   praetorius.debian.org: Hieronymus Praetorius (August 10th, 1560 - January 27th, 1629)
   prokofiev.debian.org: Sergei Sergeyevich Prokofiev (April 27th, 1891 - March 5th, 1953)
   quantz.debian.org: Johann Joachim Quantz (January 30th, 1697 - July 12th, 1773)
-  rautavaara.debian.org: Einojuhani Rautavaara (b. October 9th, 1928)
+  rachmaninoff: Sergei Vasilievich Rachmaninoff (1 April 1873 - 28 March 1943)
   rainier.debian.org: Ivy Priaulx Rainier (February 3rd, 1903 - October 10th, 1986)
   rapoport.debian.org: Eda Rothstein Rapoport (December 25th, 1890 - May 9th, 1968)
   reger.debian.org: Johann Baptist Joseph Maximilian Reger (March 19th, 1873 - May 11th, 1916)
   respighi.debian.org: Elsa Respighi (née Olivieri-Sangiacomo) (March 24th, 1894 - March 17th, 1996)
+  sallinen.debian.org: Aulis Sallinen (born April 9, 1935)
   santoro.debian.org: Cláudio Santoro (November 23rd, 1919 - March 27th, 1989)
   schumann.debian.org: Robert Alexander Schumann (June 8th, 1810 - July 29th, 1856)
   sechter.debian.org: Simon Sechter (October 11th, 1788 - September 10th, 1867)
@@ -94,20 +93,18 @@ nameinfo:
   setoguchi.debian.org: 瀬戸口藤吉, Tokichi Setoguchi (June 28th, 1868 - November 8th, 1941)
   sibelius.debian.org: Jean Sibelius (December 8th, 1865 - September 20th, 1957)
   smetana.debian.org: Bedřich Smetana (March 2nd, 1824 - May 12th, 1884)
-  sompek.debian.org: Ernst Sompek (Juni 11th 1876 - August 2nd 1954)
   sonntag.debian.org: Brunhilde Sonntag (September 27th, 1936 - December 18th, 2002)
   sor.debian.org: Fernando Sor (February 14th, 1778 - July 10th, 1839)
   soriano.debian.org: Francesco Soriano (1548 or 1549 - July 19th, 1621)
-  stadler.debian.org: Maximilian Johann Karl Dominik Stadler, Abbé Stadler (August 4th 1748 - November 8th 1833)
   stockhausen.debian.org: Karlheinz Stockhausen (August 22nd, 1928 - December 5th, 2007)
   storace.debian.org: Stephen Storace (April 4th, 1762 - March 19th, 1796)
   spontini.debian.org: Gaspare Luigi Pacifico Spontini (November 14th, 1774 - January 24th, 1851)
-  steffani.debian.org: Agostino Steffani (July 25th, 1653 - February 12th, 1728)
   tate.debian.org: Phyllis Tate (April 6th, 1911 - May 29th, 1987)
   tchaikovsky.debian.org: Pyotr Ilyich Tchaikovsky (Пётр Ильич Чайковский) (May 7th, 1840 - November 6th, 1893)
   ticharich.debian.org: Zdenka Ticharich (September 26th, 1900 - February 15th, 1979)
   tye.debian.org: Christopher Tye (c.1505 - 1573)
   ullmann.debian.org: Viktor Ullmann (January 1st, 1898 - October 17th, 1944)
+  usper.debian.org: Francesco Usper (November 1st, 1561 - February 24th, 1641)
   vento.debian.org: Ivo de Vento (1543/1545 - 1575)
   vittoria.debian.org: Tomás Luis da Vittoria (ca. 1548 - August 27th, 1611)
   vogler.debian.org: Georg Joseph Vogler (June 15th, 1749 - May 6th, 1814)
@@ -140,30 +137,13 @@ host_settings:
     - tye.debian.org
     - vento.debian.org
     - wuiet.debian.org
-  apache2_security_mirror:
-    - mirror-anu.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - lobos.debian.org
-    - santoro.debian.org
-    - setoguchi.debian.org
-    - sechter.debian.org
-    - steffani.debian.org
-    - villa.debian.org
-    - wieck.debian.org
   not-bacula-client:
-    # decommissioning
-    - rautavaara.debian.org
-    # mirrors, secondaries, syncproxies
-    - pkgmirror-1and1.debian.org
-    - steffani.debian.org
     # porterbox
     - abel.debian.org
     - asachi.debian.org
     - barriere.debian.org
     - binet.debian.org
-    - etler.debian.org
+    - eller.debian.org
     - falla.debian.org
     - fischer.debian.org
     - harris.debian.org
@@ -179,11 +159,13 @@ host_settings:
     - arm-arm-02.debian.org
     - arm-arm-03.debian.org
     - arm-arm-04.debian.org
+    - arm-conova-01.debian.org
+    - arm-conova-02.debian.org
+    - arm-conova-03.debian.org
+    - arm-conova-04.debian.org
     - arm-linaro-01.debian.org
     - arm-linaro-03.debian.org
     - arnold.debian.org
-    - babin.debian.org
-    - caballero.debian.org
     - eberlin.debian.org
     - fano.debian.org
     - fayrfax.debian.org
@@ -208,15 +190,12 @@ host_settings:
     - mipsel-manda-03.debian.org
     - mipsel-sil-01.debian.org
     - porpora.debian.org
-    - poulenc.debian.org
     - powerpc-osuosl-01.debian.org
     - powerpc-unicamp-01.debian.org
     - ppc64el-osuosl-01.debian.org
     - ppc64el-unicamp-01.debian.org
     - praetorius.debian.org
-    - sompek.debian.org
     - spontini.debian.org
-    - stadler.debian.org
     - x86-grnet-01.debian.org
     - zandonai.debian.org
     - zani.debian.org
@@ -224,6 +203,7 @@ host_settings:
     - x86-bm-01.debian.org
     - x86-csail-01.debian.org
     - x86-csail-02.debian.org
+    - x86-ubc-01.debian.org
   broken-rtc:
     - abel.debian.org
     - antheil.debian.org
@@ -231,6 +211,7 @@ host_settings:
     - arm-arm-02.debian.org
     - arm-arm-03.debian.org
     - arnold.debian.org
+    - eller.debian.org
     - harris.debian.org
     - hasse.debian.org
     - henze.debian.org
@@ -245,7 +226,6 @@ host_settings:
     - mipsel-aql-03.debian.org
     - mipsel-manda-03.debian.org
     - mipsel-sil-01.debian.org
-    - sompek.debian.org
   mail_port:
     klecker.debian.org: 2025
     zani.debian.org: 587
@@ -253,9 +233,8 @@ host_settings:
     - fano.debian.org
   entropy_key:
     - czerny.debian.org
-    # - rautavaara.debian.org
     - grnet-node01.debian.org
-    - ubc-bl2.debian.org
+    # - ubc-bl2.debian.org
     - storace.debian.org
   buildd_master:
     - wuiet.debian.org