move over dns_primary/seconday

[dsa-puppet.git] / modules / debian-org / misc / local.yaml

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index bb0f94dde5a6f3d39dfc12e75fb13202423b40f5..15ade4fa48410f179bea36b2d49a6989b7c7d816 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -124,6 +124,7 @@ nameinfo:
   sompek.debian.org: Ernst Sompek (Juni 11th 1876 - August 2nd 1954)
   sonntag.debian.org: Brunhilde Sonntag (September 27th, 1936 - December 18th, 2002)
   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)
   spohr.debian.org: Louis Spohr (April 5th, 1784 - October 22nd, 1859)
   spontini.debian.org: Gaspare Luigi Pacifico Spontini (November 14th, 1774 - January 24th, 1851)
   stabile.debian.org: Annibale Stabile (~1535 - April 1595)
@@ -143,54 +144,13 @@ nameinfo:
   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)
-  zappa.debian.org: Frank Vincent Zappa (December 21st, 1940 - December 4th, 1993)
+  zani.debian.org: Andrea Teodoro Zani (November 11th, 1696 - September 28th, 1757)
   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
@@ -305,7 +265,7 @@ host_settings:
     - spontini.debian.org
     - stadler.debian.org
     - zandonai.debian.org
-    - zappa.debian.org
+    - zani.debian.org
     - zemlinsky.debian.org
     # Not worth backing up
     - rainier.debian.org
@@ -335,7 +295,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
@@ -345,26 +305,6 @@ 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