add keyring

[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 70e702ee34134d9da79a68620c2fe5ef8dfe2748..02c0aede91739fe604fefdc4f70592d146b04ecb 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -66,10 +66,10 @@ nameinfo:
   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)
-  liszt.debian.org: Franz Liszt (October 22nd, 1811 - July 31st, 1886)
   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)
@@ -84,7 +84,6 @@ 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)
-  penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1st, 1528)
   pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736)
   peri.debian.org: Jacopo Peri (August 20th, 1561 - August 12th, 1633)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
@@ -102,7 +101,6 @@ nameinfo:
   reger.debian.org: Johann Baptist Joseph Maximilian Reger (March 19, 1873 - May 11th, 1916)
   ries.debian.org: Franz Ries (April 7th, 1846 - January 20th, 1932)
   rietz.debian.org: August Wilhelm Julius Rietz (December 28th, 1812 - September 12th, 1877)
-  rore.debian.org: Cipriano de Rore (occasionally Cypriano) (1515 or 1516 - between September 11 and September 20, 1565)
   rossini.debian.org: Gioachino Rossini (February 29th, 1792 - November 13th, 1868)
   saens.debian.org: Charles-Camille Saint-Saëns  (October 9th, 1835 - December 16th, 1921)
   salieri.debian.org: Antonio Salieri (August 18th, 1750 - May 7th, 1825)
@@ -143,11 +141,25 @@ footer:
   #zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
   #zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
+  backports_master:
+    - bizet.debian.org
+    - morricone.debian.org
   bugsmaster:
   bugsmx:
     - busoni.debian.org
+  bugs_search:
+    - glinka.debian.org
   dbmaster:
     - draghi.debian.org
+  ftp_master:
+    - franck.debian.org
+  ftp.d.o:
+    - kassia.debian.org
+    - klecker.debian.org
+  ftp.upload.d.o:
+    - franck.debian.org
+    - kassia.debian.org
+    - ravel.debian.org
   mailrelay:
     - kokkonen.debian.org
     - merikanto.debian.org
@@ -161,6 +173,12 @@ services:
   puppetmaster: handel.debian.org
   rtmaster:
     - reger.debian.org
+  security_master:
+    - chopin.debian.org
+  www_master:
+    - wolkenstein.debian.org
+  keyring:
+    - kaufmann.debian.org
 host_settings:
   heavy_exim:
     - bellini.debian.org
@@ -231,6 +249,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
@@ -243,7 +262,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