try to rolify dns

[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 55b19c370629d4f332b8245b598e7425f0a4fe21..9210978bee772e004ce739b3b52e3625834ef324 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -145,7 +145,6 @@ nameinfo:
   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:
@@ -177,7 +176,6 @@ services:
     - orff.debian.org
   packagesmaster: picconi.debian.org
   packagesqamaster: quantz.debian.org
-  puppetmaster: handel.debian.org
   rtmaster:
     - reger.debian.org
   security_master:
@@ -307,7 +305,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
@@ -337,7 +335,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
@@ -370,3 +368,10 @@ host_settings:
   buildd_master:
     - grieg.debian.org
     - wuiet.debian.org
+  dns_primary:
+    - denis.debian.org
+  dns_secondary:
+    - ravel.debian.org
+    - senfl.debian.org
+    - diamond.debian.org
+    - orff.debian.org