X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=f962b72bc9737a71a67696a11adeb04a5b922e6c;hb=fe1b4ba5fb5321a98b3270b181f6b22f5ff93931;hp=4f008738ca3b6268d43e7e2a9c0e54c1c74f0b4c;hpb=25ca71bcbf8648fe71809f2c0a3facb4c947a02e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 4f008738c..f962b72bc 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -179,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:
@@ -190,6 +190,22 @@ services:
     - wolkenstein.debian.org
   keyring:
     - kaufmann.debian.org
+  wiki:
+    - wilder.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
@@ -207,6 +223,7 @@ host_settings:
     - morricone.debian.org
     - muffat.debian.org
     - nono.debian.org
+    - picconi.debian.org
     - popov.debian.org
     - quantz.debian.org
     - ravel.debian.org
@@ -225,7 +242,6 @@ host_settings:
     - wieck.debian.org
   apache2_www_mirror:
     - bellini.debian.org
-    - englund.debian.org
     - gluck.debian.org
     - kokkonen.debian.org
     - santoro.debian.org
@@ -270,11 +286,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