Move all roles from local.yaml to hiera

[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..b3cc7946aa56f1a0b5b5b706a4a3b952637a337e 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -145,54 +145,12 @@ 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:
   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
@@ -307,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
@@ -337,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
@@ -370,3 +328,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