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

[mirror/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 f7b02ac..08b6a75 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -94,7 +94,6 @@ nameinfo:
   pejacevic: Dora Pejačević (September 10, 1885 - March 5, 1923)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
   picconi.debian.org: Maria Antonietta Picconi (September 23rd, 1869 - 1926)
-  piston.debian.org: Walter Hamor Piston Jr. (January 20th, 1894 – November 12th, 1976)
   popov.debian.org: Gavriil Nikolayevich Popov (Гаврии́л Никола́евич Попо́в) (September 12th, 1904 - February 17th, 1972)
   porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
   poulenc.debian.org: Francis Jean Marcel Poulenc (January 7, 1899 - January 30, 1963)
@@ -166,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:
@@ -181,6 +178,8 @@ services:
     - reger.debian.org
   security_master:
     - chopin.debian.org
+  syncproxy:
+    - milanollo.debian.org
   www_master:
     - wolkenstein.debian.org
   keyring:
@@ -199,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
@@ -208,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:
@@ -226,14 +223,6 @@ host_settings:
     - kokkonen.debian.org
     - santoro.debian.org
     - senfl.debian.org
-  'apache2_ftp-upcoming_mirror':
-    - klecker.debian.org
-    - rietz.debian.org
-  timeserver:
-    - busoni.debian.org
-    - merikanto.debian.org
-    - orff.debian.org
-    - ravel.debian.org
   not-bacula-client:
     - abel.debian.org
     - agricola.debian.org
@@ -251,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
@@ -318,13 +306,11 @@ host_settings:
     - morricone.debian.org
     - muffat.debian.org
     - mundy.debian.org
-    - murphy.debian.org
     - paganini.debian.org
     - parry.debian.org
     - partch.debian.org
     - pasquini.debian.org
     - pettersson.debian.org
-    - piston.debian.org
     - pkgmirror-1and1.debian.org
     - porpora.debian.org
     - poulenc.debian.org
@@ -420,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"