spohr no longer is munin-master. no need for heavy-exim there either

[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 4a59c0439b9e1266230890ac7c5de10c213dcc62..08b6a75bc486983e447c366a1158b9a21b80736c 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -165,10 +165,8 @@ services:
     - ravel.debian.org
   mailrelay:
     - mailly.debian.org
-    - merikanto.debian.org
     - muffat.debian.org
   muninmaster:
-    - spohr.debian.org
     - menotti.debian.org
   nagiosmaster: tchaikovsky.debian.org
   extranrpeclient:
@@ -180,6 +178,8 @@ services:
     - reger.debian.org
   security_master:
     - chopin.debian.org
+  syncproxy:
+    - milanollo.debian.org
   www_master:
     - wolkenstein.debian.org
   keyring:
@@ -198,7 +198,6 @@ host_settings:
     - grieg.debian.org
     - mailly.debian.org
     - master.debian.org
-    - merikanto.debian.org
     - morricone.debian.org
     - muffat.debian.org
     - nono.debian.org
@@ -207,7 +206,6 @@ host_settings:
     - quantz.debian.org
     - ravel.debian.org
     - reger.debian.org
-    - spohr.debian.org
     - tye.debian.org
     - vento.debian.org
   apache2_security_mirror:
@@ -242,7 +240,6 @@ host_settings:
     - barber.debian.org
     - barriere.debian.org
     - beach.debian.org
-    - bendel.debian.org
     - berlioz.debian.org
     - bertali.debian.org
     - binet.debian.org
@@ -309,7 +306,6 @@ host_settings:
     - morricone.debian.org
     - muffat.debian.org
     - mundy.debian.org
-    - murphy.debian.org
     - paganini.debian.org
     - parry.debian.org
     - partch.debian.org
@@ -410,8 +406,5 @@ host_settings:
   weblog_provider:
     - busoni.debian.org
     - 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"