X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=e805c1e7e106cc93314b811a5870ddd9705d7421;hb=1659cbeda7f2270dc39738493ca5bb384d1ddaf2;hp=405a56875e1bf6ee893dd36c2b195668d6b4f213;hpb=7625d4a83452efc6467fa79a65b5030d42bd547a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 405a56875..e805c1e7e 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -10,7 +10,6 @@ nameinfo:
   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)
   bendel.debian.org: Franz Bendel (March 23rd, 1833 - July 3rd, 1874)
-  berlioz.debian.org: Hector Berlioz (December 11th, 1803 - March 8th, 1869)
   binet.debian.org: Jocelyne Binet (September 27th, 1923 - January 13th, 1968)
   boott.debian.org: Francis Boott (June 24th, 1813 - March 1st, 1904)
   busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
@@ -27,7 +26,7 @@ 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)
@@ -52,23 +51,18 @@ nameinfo:
   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)
-  lamb.debian.org: John David Lamb (b. 1935)
-  lafayette.debian.org: Eugenie Lafayette
   lindsay.debian.org: Maria Lindsay Bliss (May 15th, 1827 - April 3rd, 1898)
-  locke.debian.org: Matthew Locke (ca. 1621 - 1677)
   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)
   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)
-  merulo.debian.org: Claudio Merulo (April 8th, 1533 - May 4th, 1604)
   milanollo.debian.org: Teresa Milanollo (August 28th, 1827 - October 25th, 1904)
   minkus.debian.org: Ludwig Minkus (March 23rd 1826 - December 7th, 1917)
   muffat.debian.org: George Muffat (June 1st, 1653 - February 23rd, 1704)
-  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 29th, 1924 - May 8th, 1990)
+  olin.debian.org: Elisabeth Olin (December 1740 - March 26th, 1828)
   oyens.debian.org: Tera de Marez Oyens (August 5th, 1932 - August 29th, 1996)
   paradis.debian.org: Maria Theresia Paradis (May 15th, 1759 - February 1st, 1824)
   partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
@@ -93,12 +87,10 @@ nameinfo:
   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)
-  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)
   schumann.debian.org: Robert Alexander Schumann (June 8th, 1810 - July 29th, 1856)
   sechter.debian.org: Simon Sechter (October 11th, 1788 - September 10th, 1867)
   seger.debian.org: Josef Seger (March 21st, 1716 - April 22nd, 1782)
-  senfl.debian.org: Ludwig Senfl (~1490 - ~1543)
   senfter.debian.org: Johanna Senfter (November, 27th, 1879 - August 11th, 1961)
   setoguchi.debian.org: 瀬戸口藤吉, Tokichi Setoguchi (June 28th, 1868 - November 8th, 1941)
   sibelius.debian.org: Jean Sibelius (December 8th, 1865 - September 20th, 1957)
@@ -149,18 +141,6 @@ 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
@@ -172,11 +152,10 @@ host_settings:
     - asachi.debian.org
     - barriere.debian.org
     - binet.debian.org
-    - etler.debian.org
+    - eller.debian.org
     - falla.debian.org
     - fischer.debian.org
     - harris.debian.org
-    - merulo.debian.org
     - minkus.debian.org
     - partch.debian.org
     - pizzetti.debian.org
@@ -193,7 +172,6 @@ host_settings:
     - arm-linaro-03.debian.org
     - arnold.debian.org
     - babin.debian.org
-    - caballero.debian.org
     - eberlin.debian.org
     - fano.debian.org
     - fayrfax.debian.org
@@ -203,20 +181,20 @@ host_settings:
     - hasse.debian.org
     - henze.debian.org
     - hoiby.debian.org
-    - lucatelli.debian.org
     - mips-aql-01.debian.org
     - mips-aql-02.debian.org
     - mips-aql-04.debian.org
     - mips-aql-05.debian.org
     - mips-aql-06.debian.org
     - mips-sil-01.debian.org
+    - mips-manda-01.debian.org
     - mipsel-aql-01.debian.org
     - mipsel-aql-02.debian.org
     - mipsel-aql-03.debian.org
     - mipsel-manda-01.debian.org
     - mipsel-manda-02.debian.org
+    - mipsel-manda-03.debian.org
     - mipsel-sil-01.debian.org
-    - mundy.debian.org
     - porpora.debian.org
     - poulenc.debian.org
     - powerpc-osuosl-01.debian.org
@@ -241,28 +219,27 @@ 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
     - hoiby.debian.org
-    - lucatelli.debian.org
     - mips-aql-01.debian.org
     - mips-aql-02.debian.org
     - mips-aql-04.debian.org
     - mips-aql-05.debian.org
     - mips-aql-06.debian.org
+    - mips-manda-01.debian.org
     - mips-sil-01.debian.org
     - 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
   no_munin:
-    - allegri.debian.org
-    - escher.debian.org
     - fano.debian.org
-    - malo.debian.org
   entropy_key:
     - czerny.debian.org
     # - rautavaara.debian.org