Decommision englund

[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 91c44f044ac11e07f2bd770903208098b25425bd..12dcc528a86dc05142b48bc92f381d2e07a8d65f 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -1,6 +1,7 @@
 ---
 nameinfo:
   abel.debian.org: Carl Friedrich Abel (1723 - 1787)
+  adayevskaya.debian.org: Ella Georgiyevna Adayevskaya (February, 22nd 1846 [O.S. February 10th] - July 26th, 1926)
   agricola.debian.org: Alexander Agricola (1445 or 1446 - August 15th, 1506)
   alain.debian.org: Jehan Alain (1911 - 1940)
   alwyn.debian.org: William Alwyn (1905 - 1985)
@@ -178,7 +179,7 @@ services:
   nagiosmaster: tchaikovsky.debian.org
   extranrpeclient:
     - orff.debian.org
-  #packagesmaster: powell.debian.org
+  packagesmaster: picconi.debian.org
   packagesqamaster: quantz.debian.org
   puppetmaster: handel.debian.org
   rtmaster:
@@ -189,6 +190,20 @@ services:
     - wolkenstein.debian.org
   keyring:
     - kaufmann.debian.org
+  # new style porterbox (schroot, dd installable packages etc)
+  porterbox:
+    # once they are all on new-style, we can use ldap for this
+    - agricola.debian.org
+    - barriere.debian.org
+    - eder.debian.org
+    - falla.debian.org
+    - fischer.debian.org
+    - gabrielli.debian.org
+    - harris.debian.org
+    - merulo.debian.org
+    - partch.debian.org
+    - smetana.debian.org
+    - zelenka.debian.org
 host_settings:
   heavy_exim:
     - bellini.debian.org
@@ -206,6 +221,7 @@ host_settings:
     - morricone.debian.org
     - muffat.debian.org
     - nono.debian.org
+    - picconi.debian.org
     - popov.debian.org
     - quantz.debian.org
     - ravel.debian.org
@@ -224,7 +240,6 @@ host_settings:
     - wieck.debian.org
   apache2_www_mirror:
     - bellini.debian.org
-    - englund.debian.org
     - gluck.debian.org
     - kokkonen.debian.org
     - santoro.debian.org
@@ -269,11 +284,11 @@ host_settings:
     - malo.debian.org
   entropy_key:
     - czerny.debian.org
-    - englund.debian.org
     - rautavaara.debian.org
     - salieri.debian.org
   static_master:
     - bizet.debian.org
+    - franck.debian.org
   static_mirror:
     - klecker.debian.org
     - rietz.debian.org
@@ -287,6 +302,8 @@ host_settings:
     - wolkenstein.debian.org
   weblog_provider:
     - klecker.debian.org
+    - rietz.debian.org
+    - stanley.debian.org
     - senfter.debian.org
 #  reservedaddrs:
 #    ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"