Move reservedaddrs directly into exim.conf

[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 77d506c..ff6e47e 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -93,9 +93,7 @@ nameinfo:
   pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710)
   pejacevic: Dora Pejačević (September 10, 1885 - March 5, 1923)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
-  piatti.debian.org: Carlo Alfredo Piatti (January 8th, 1822 - July 18th, 1901)
   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)
@@ -167,7 +165,6 @@ services:
     - ravel.debian.org
   mailrelay:
     - mailly.debian.org
-    - merikanto.debian.org
     - muffat.debian.org
   muninmaster:
     - spohr.debian.org
@@ -200,7 +197,6 @@ host_settings:
     - grieg.debian.org
     - mailly.debian.org
     - master.debian.org
-    - merikanto.debian.org
     - morricone.debian.org
     - muffat.debian.org
     - nono.debian.org
@@ -227,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
@@ -325,8 +313,6 @@ host_settings:
     - partch.debian.org
     - pasquini.debian.org
     - pettersson.debian.org
-    - piatti.debian.org
-    - piston.debian.org
     - pkgmirror-1and1.debian.org
     - porpora.debian.org
     - poulenc.debian.org
@@ -394,7 +380,6 @@ host_settings:
   mail_port:
     ancina.debian.org: 2025
     klecker.debian.org: 2025
-    piatti.debian.org: 2025
     zappa.debian.org: 587
   no_munin:
     - allegri.debian.org
@@ -426,5 +411,3 @@ host_settings:
     - 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"