X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=410ffe43eb2326b122d531b0319962513062b5cf;hb=9e4e80d6ce4591c4cca8f87c630697d21f168cf2;hp=d31af9e15252fe18c055d979cd0954a5720ce026;hpb=834c91384a644510c56ecdadd66bb152f993ed60;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index d31af9e15..410ffe43e 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -38,6 +38,7 @@ nameinfo:
   kassia.debian.org: Kassia (between 805 and 810 - bef. 867)
   kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
+  kokkonen.debian.org: November 13th, 1921 - October 1st, 1996)
   krenek.debian.org: Ernst Krenek (August 23rd, 1900 - December 22nd, 1991)
   lafayette.debian.org: Eugenie Lafayette
   lebrun.debian.org: Francesca Lebrun (March 24th, 1756 - May 14th, 1791)
@@ -115,9 +116,9 @@ services:
     - spohr.debian.org
     - merikanto.debian.org
   muninmaster: spohr.debian.org
-  nagiosmaster:
+  nagiosmaster: tchaikovsky.debian.org
+  extranrpeclient:
     - draghi.debian.org
-    - tchaikovsky.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
   puppetmaster: handel.debian.org
@@ -129,6 +130,7 @@ host_settings:
     - busoni.debian.org
     - chopin.debian.org
     - draghi.debian.org
+    - franck.debian.org
     - grieg.debian.org
     - klecker.debian.org
     - master.debian.org
@@ -142,7 +144,6 @@ host_settings:
     - valente.debian.org
   apache2_security_mirror:
     - gluck.debian.org
-    - kassia.debian.org
     - lobos.debian.org
     - raff.debian.org
     - saens.debian.org
@@ -230,6 +231,7 @@ host_settings:
     holter.debian.org: mailout.debian.org
     kassia.debian.org: mailout.debian.org
     kaufmann.debian.org: mailout.debian.org
+    kokkonen.debian.org: mailout.debian.org
     krenek.debian.org: mailout.debian.org
     lafayette.debian.org: mailout.debian.org
     lebrun.debian.org: mailout.debian.org
@@ -299,6 +301,7 @@ host_settings:
   no_munin:
     - agnesi.debian.org
     - allegri.debian.org
+    - byrd.debian.org
     - carver.debian.org
     - escher.debian.org
     - fano.debian.org
@@ -306,6 +309,7 @@ host_settings:
     - mahler.debian.org
     - malo.debian.org
     - mendes.debian.org
+    - monteverdi.debian.org
     - morales.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"