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 d680595..ff6e47e 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -42,7 +42,6 @@ nameinfo:
   draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700)
   eder.debian.org: Helmut Eder (December 26th, 1916 - February 8th, 2005)
   elgar.debian.org: Edward Elgar (1857 - 1934)
-  englund.debian.org: Sven Einar Englund (June 17th, 1916 - June 27th, 1999)
   eysler.debian.org: Edmund Samuel Eysler (March 12th, 1874 - October 4th, 1949)
   falla.debian.org: Manuel de Falla y Matheu (November 23rd, 1876 - November 14th, 1946)
   fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961)
@@ -71,7 +70,6 @@ nameinfo:
   lafayette.debian.org: Eugenie Lafayette
   lebrun.debian.org: Francesca Lebrun (March 24th, 1756 - May 14th, 1791)
   lilburn.debian.org: Douglas Gordon Lilburn (November 2nd, 1915 - June 6th, 2001)
-  lindberg.debian.org: Magnus Lindberg (June 27th, 1958)
   locke.debian.org: Matthew Locke (ca. 1621 - 1677)
   lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740)
   luchesi.debian.org: Andrea Luca Luchesi (May 23rd, 1741 - March 21st, 1801)
@@ -93,12 +91,9 @@ nameinfo:
   parry.debian.org: Sir Charles Hubert Hastings Parry, 1st Baronet (February 27th, 1848 – October 7th, 1918)
   partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
   pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710)
-  pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736)
   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)
@@ -170,7 +165,6 @@ services:
     - ravel.debian.org
   mailrelay:
     - mailly.debian.org
-    - merikanto.debian.org
     - muffat.debian.org
   muninmaster:
     - spohr.debian.org
@@ -203,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
@@ -230,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
@@ -327,10 +312,7 @@ host_settings:
     - parry.debian.org
     - partch.debian.org
     - pasquini.debian.org
-    - pergolesi.debian.org
     - pettersson.debian.org
-    - piatti.debian.org
-    - piston.debian.org
     - pkgmirror-1and1.debian.org
     - porpora.debian.org
     - poulenc.debian.org
@@ -398,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
@@ -430,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"