Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[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 d7a8da0..aac5692 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -32,6 +32,7 @@ nameinfo:
   merkel.debian.org: Gustav (Adolf) Merkel (November 12, 1827 - October 30, 1885)
   merulo.debian.org: Claudio Merulo (8 April 1533 - 4 May 1604)
   morales.debian.org: Cristóbal de Morales (c. 1500 - between September 4 and October 7, 1553)
+  morricone.debian.org: Ennio Morricone (November 10, 1928 - )
   mundy.debian.org: William Mundy (c. 1529 - 1591)
   paer.debian.org: Ferdinando Paër (July 1, 1771 - May 3, 1839)
   penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1, 1528)
@@ -103,6 +104,7 @@ host_settings:
     - gluck.debian.org
     - kaufmann.debian.org
     - klecker.debian.org
+    - liszt.debian.org
     - lobos.debian.org
     - piatti.debian.org
     - raff.debian.org
@@ -118,6 +120,15 @@ host_settings:
     - villa.debian.org
     - wieck.debian.org
     - wolkenstein.debian.org
+  apache2_security_mirror:
+    - gluck.debian.org
+    - kassia.debian.org
+    - lobos.debian.org
+    - saens.debian.org
+    - schein.debian.org
+    - steffani.debian.org
+    - villa.debian.org
+    - wieck.debian.org
   buildd:
     - ancina.debian.org
     - arcadelt.debian.org