X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=546e2368986d2b05a1d614df46e9109700eaf30f;hb=ef4f352b86f9afb79e524278424cd8546d5f780a;hp=22d742d84184fe223d765163f03c5c1a8d475e16;hpb=09a4b91b3afe4bc9a768731b99dc057422117d5f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 22d742d84..546e23689 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -57,7 +57,6 @@ 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)
@@ -139,59 +138,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
-  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
@@ -199,7 +158,6 @@ host_settings:
     - draghi.debian.org
     - franck.debian.org
     - gombert.debian.org
-    - grieg.debian.org
     - mailly.debian.org
     - master.debian.org
     - muffat.debian.org
@@ -307,7 +265,6 @@ host_settings:
     - stadler.debian.org
     - zandonai.debian.org
     - zani.debian.org
-    - zappa.debian.org
     - zemlinsky.debian.org
     # Not worth backing up
     - rainier.debian.org
@@ -337,7 +294,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
@@ -347,26 +304,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