move more to roles

[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 c975cce40d157628a21495ef0143aaebf4ef3d48..be6e920caa8989bf9ba794b38ab2ddd10c9bc4e2 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -151,46 +151,6 @@ 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
@@ -345,26 +305,13 @@ 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
+  dns_primary:
+    - denis.debian.org
+  dns_secondary:
+    - ravel.debian.org
+    - senfl.debian.org
+    - diamond.debian.org
+    - orff.debian.org