X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=7110b8d4b6e19d90ca5e82d9df52d633b2400802;hb=f476381b6da463c4e7f178b64c8d5c4bcb87fd68;hp=0a36a2e6a49788b2eee1a7054fdb2bd900c77583;hpb=c42332339cf9021f8b94604b06333cd222b4d496;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 0a36a2e6a..7110b8d4b 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -2,8 +2,6 @@
 nameinfo:
   abel.debian.org: Carl Friedrich Abel (1723 - 1787)
   adayevskaya.debian.org: Ella Georgiyevna Adayevskaya (February, 22nd 1846 [O.S. February 10th] - July 26th, 1926)
-  agricola.debian.org: Alexander Agricola (1445 or 1446 - August 15th, 1506)
-  alain.debian.org: Jehan Alain (1911 - 1940)
   alwyn.debian.org: William Alwyn (1905 - 1985)
   ancina.debian.org: Giovanni Giovenale Ancina (October 19th, 1545 - August 30th, 1604)
   antheil.debian.org: George Antheil (1900 - 1959)
@@ -43,6 +41,7 @@ nameinfo:
   dillon.debian.org: Fannie Charles Dillon (March 16th, 1881 - February 21st, 1947)
   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)
   eder.debian.org: Helmut Eder (December 26th, 1916 - February 8th, 2005)
   elgar.debian.org: Edward Elgar (1857 - 1934)
   eysler.debian.org: Edmund Samuel Eysler (March 12th, 1874 - October 4th, 1949)
@@ -57,11 +56,9 @@ nameinfo:
   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)
-  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)
   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 - October 27th, 2012)
   hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011)
   jenkins.debian.org: John Jenkins (1592 - 1678)
@@ -86,7 +83,7 @@ nameinfo:
   nielsen.debian.org: Carl August Nielsen (June 9th, 1865 - October 3rd, 1931)
   nono.debian.org: Luigi Nono (January 29th, 1924 - May 8th, 1990)
   orff.debian.org: Carl Orff (July 10th, 1895 - March 29th, 1982)
-  paganini.debian.org: Niccolò Paganini (October 27th, 1782 - May 27th, 1840)
+  oyens.debian.org: Tera de Marez Oyens (August 5th, 1932 - August 29th, 1996)
   parry.debian.org: Sir Charles Hubert Hastings Parry, 1st Baronet (February 27th, 1848 – October 7th, 1918)
   partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
   pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710)
@@ -139,60 +136,19 @@ nameinfo:
   vento.debian.org: Ivo de Vento (1543/1545 - 1575)
   vieuxtemps.debian.org: Henri Vieuxtemps (February 17th, 1820 - June 6th, 1881)
   vitry.debian.org: Philippe de Vitry (October 31st, 1291 - June 9th, 1361)
+  vogler.debian.org: Georg Joseph Vogler (June 15th, 1749 - May 6th, 1814)
   wieck.debian.org: Clara Josephine Wieck (September 13th, 1819 - May 20th, 1896)
   wilder.debian.org: Alec Wilder (February 16th, 1907 - December 24th, 1980)
   wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
   wuiet.debian.org: Caroline Wuiet (1766 - 1835)
   zandonai.debian.org: Riccardo Zandonai (May 30th, 1883 - June 5th, 1944)
   zani.debian.org: Andrea Teodoro Zani (November 11th, 1696 - September 28th, 1757)
-  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:
   dummy: foo
   #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]"
-services:
-  bugsmaster:
-  bugsmx:
-    - buxtehude.debian.org
-  bugs_mirror:
-    - beach.debian.org
-  dbmaster:
-    - draghi.debian.org
-  ftp_master:
-    - franck.debian.org
-  ftp.d.o:
-    - klecker.debian.org
-  ftp.upload.d.o:
-    - franck.debian.org
-    - ravel.debian.org
-  mailrelay:
-    - mailly.debian.org
-    - muffat.debian.org
-  muninmaster:
-    - menotti.debian.org
-  nagiosmaster: tchaikovsky.debian.org
-  extranrpeclient:
-    - orff.debian.org
-  packagesmaster: picconi.debian.org
-  packagesqamaster: quantz.debian.org
-  puppetmaster: handel.debian.org
-  rtmaster:
-    - reger.debian.org
-  security_master:
-    - chopin.debian.org
-  syncproxy:
-    - milanollo.debian.org
-  www_master:
-    - wolkenstein.debian.org
-  keyring:
-    - kaufmann.debian.org
-  wiki:
-    - wilder.debian.org
-  pubsub:
-    - rainier.debian.org
-    - rapoport.debian.org
 host_settings:
   heavy_exim:
     - buxtehude.debian.org
@@ -200,7 +156,6 @@ host_settings:
     - draghi.debian.org
     - franck.debian.org
     - gombert.debian.org
-    - grieg.debian.org
     - mailly.debian.org
     - master.debian.org
     - muffat.debian.org
@@ -252,7 +207,6 @@ host_settings:
     - wieck.debian.org
     # porterbox
     - abel.debian.org
-    - agricola.debian.org
     - barriere.debian.org
     - binet.debian.org
     - eder.debian.org
@@ -265,7 +219,6 @@ host_settings:
     - smetana.debian.org
     - zelenka.debian.org
     # buildd
-    - alain.debian.org
     - alkman.debian.org
     - alwyn.debian.org
     - ancina.debian.org
@@ -280,6 +233,7 @@ host_settings:
     - brahms.debian.org
     - caballero.debian.org
     - corelli.debian.org
+    - eberlin.debian.org
     - eysler.debian.org
     - fano.debian.org
     - fayrfax.debian.org
@@ -288,7 +242,6 @@ host_settings:
     - hartmann.debian.org
     - hasse.debian.org
     - henze.debian.org
-    - hildegard.debian.org
     - hoiby.debian.org
     - howells.debian.org
     - hummel.debian.org
@@ -308,14 +261,12 @@ host_settings:
     - stadler.debian.org
     - zandonai.debian.org
     - zani.debian.org
-    - zappa.debian.org
     - zemlinsky.debian.org
     # Not worth backing up
     - rainier.debian.org
     - rapoport.debian.org
   broken-rtc:
     - abel.debian.org
-    - alain.debian.org
     - alwyn.debian.org
     - ancina.debian.org
     - antheil.debian.org
@@ -324,9 +275,7 @@ host_settings:
     - ball.debian.org
     - harris.debian.org
     - hasse.debian.org
-    - hebden.debian.org
     - henze.debian.org
-    - hildegard.debian.org
     - hoiby.debian.org
     - howells.debian.org
     - hummel.debian.org
@@ -338,7 +287,7 @@ host_settings:
   mail_port:
     ancina.debian.org: 2025
     klecker.debian.org: 2025
-    zappa.debian.org: 587
+    zani.debian.org: 587
   no_munin:
     - allegri.debian.org
     - escher.debian.org
@@ -348,26 +297,5 @@ host_settings:
     - czerny.debian.org
     - rautavaara.debian.org
     - salieri.debian.org
-  static_master:
-    - bizet.debian.org
-    - dillon.debian.org
-    - franck.debian.org
-  static_mirror:
-    - busoni.debian.org
-    - klecker.debian.org
-    - senfter.debian.org
-  static_source:
-    - master.debian.org
-    - dillon.debian.org
-    - franck.debian.org
-    - philp.debian.org
-    - ravel.debian.org
-    - senfl.debian.org
-    - wolkenstein.debian.org
-  weblog_provider:
-    - busoni.debian.org
-    - klecker.debian.org
-    - senfter.debian.org
   buildd_master:
-    - grieg.debian.org
     - wuiet.debian.org