Merge branch 'rsync-shuffle'

[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 649400df4e2fb3c0ee4e767e4490b844443d5556..f6df5968b1a570fc62477a48cfd548e3774160e9 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -35,10 +35,12 @@ nameinfo:
   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)
   fasch.debian.org: Johann Friedrich Fasch (1688 - 1758)
   field.debian.org: John Field (1782 - 1837)
   finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
+  fischer.debian.org: Johann Caspar Ferdinand Fischer (September 9th, 1656 - August 27th, 1746)
   franck.debian.org: Melchior Franck (1579 - June 1st, 1639)
   gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 - July 10th, 1690)
   glinka.debian.org: Mikhail Ivanovich Glinka (1804 - 1857)
@@ -69,6 +71,7 @@ nameinfo:
   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)
+  lully.debian.org: Jean-Baptiste de Lully (November 28th, 1632 - March 22nd, 1687)
   mayer.debian.org: John Mayer (October 28th, 1930 - March 9th, 2004)
   mayr.debian.org: Johann(es) Simon Mayr (June 14th, 1763 - December 2nd, 1845)
   merikanto.debian.org: Oskar Merikanto (August 5th, 1868 - February 17th, 1924)
@@ -146,6 +149,8 @@ services:
   bugsmaster:
   bugsmx:
     - busoni.debian.org
+  bugs_search:
+    - glinka.debian.org
   dbmaster:
     - draghi.debian.org
   ftp_master:
@@ -172,6 +177,10 @@ services:
     - reger.debian.org
   security_master:
     - chopin.debian.org
+  www_master:
+    - wolkenstein.debian.org
+  keyring:
+    - kaufmann.debian.org
 host_settings:
   heavy_exim:
     - bellini.debian.org
@@ -242,6 +251,7 @@ host_settings:
     - hummel.debian.org
     - lucatelli.debian.org
     - rem.debian.org
+    - sompek.debian.org
   mail_port:
     ancina.debian.org: 2025
     kassia.debian.org: 587
@@ -254,7 +264,7 @@ host_settings:
     - fano.debian.org
     - malo.debian.org
   entropy_key:
-    - heininen.debian.org
+    #- heininen.debian.org
     - englund.debian.org
     - rautavaara.debian.org
     - salieri.debian.org