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 5ea87ee..ceebd2c 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -10,6 +10,7 @@ nameinfo:
   bartok.debian.org: Béla Viktor János Bartók (March 25, 1881 - September 26, 1945)
   bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835)
   brahms.debian.org: Johannes Brahms (May 7, 1833 - April 3, 1897)
+  byrd.debian.org: William Byrd (1543 - 1623)
   carver.debian.org: Robert Carver (ca.1485 - ca.1570)
   chopin.debian.org: Frédéric Chopin (1 March 1810 - 17 October 1849)
   cimarosa.debian.org: Domenico Cimarosa (17 December 1749 - 11 January 1801)
@@ -31,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)
@@ -96,6 +98,7 @@ host_settings:
   apache2_defaultconfig:
     - bellini.debian.org
     - carver.debian.org
+    - cimarosa.debian.org
     - draghi.debian.org
     - duarte.debian.org
     - gluck.debian.org
@@ -116,6 +119,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