X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=ceebd2ca242f4945888bf9ecf7605e2f6f4b481f;hb=b233cbf36fe50a47edd458cc29b8ba9806273e2c;hp=07290ba256e098eec68b617cf2ed035e556d9754;hpb=1c5277051a84680bf1c6dda0e7965c56c5afd142;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 07290ba25..ceebd2ca2 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -8,9 +8,12 @@ nameinfo:
   arcadelt.debian.org: Jacques Arcadelt (also Jacob Arcadelt) (?1507 - October 14, 1568)
   argento.debian.org: Dominick Argento (b. October 27, 1927)
   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)
   dijkstra.debian.org: Lowell Dijkstra (b.1952)
   draghi.debian.org: Antonio Draghi (1635 - 16 January  1700)
   duarte.debian.org: Leonora Duarte (28 July  1610 - 1678)
@@ -19,6 +22,7 @@ nameinfo:
   goetz.debian.org: Hermann Gustav Goetz (December 7, 1840 - December 3, 1876)
   handel.debian.org: Georg Friedrich Händel (23 February 1685 - 14 April 1759)
   kassia.debian.org: Kassia (between 805 and 810 - bef. 867)
+  kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11, 2000)
   lafayette.debian.org: Eugenie Lafayette
   lebrun.debian.org: Francesca Lebrun (March 24, 1756 - May 14, 1791)
@@ -28,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)
@@ -53,7 +58,7 @@ nameinfo:
   sperger.debian.org: Johannes Matthias Sperger (March 23, 1750 - May 13, 1812)
   spohr.debian.org: Louis Spohr (5 April 1784 - 22 October 1859)
   spontini.debian.org: Gaspare Luigi Pacifico Spontini (14 November 1774 - 24 January 1851)
-  stabile.debian.org: Annibale Stabile (~1535 - April 1595
+  stabile.debian.org: Annibale Stabile (~1535 - April 1595)
   steffani.debian.org: Agostino Steffani (25 July 1653 - 12 February 1728)
   strauss.debian.org: Johann Baptist Strauß (October 25, 1825 - June 3, 1899)
   tartini.debian.org: Giuseppe Tartini (April 8, 1692 - February 26, 1770)
@@ -64,6 +69,7 @@ nameinfo:
   wagner.debian.org: Wilhelm Richard Wagner (22 May 1813 - 13 February 1883)
   widor.debian.org: Charles-Marie Jean Albert Widor (February 21, 1844 - March 12, 1937)
   wieck.debian.org: Clara Josephine Wieck (September 13, 1819 - May 20, 1896)
+  wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
   zelenka.debian.org: Jan Dismas Zelenka (16 October 1679 - 23 December 1745)
 footer:
   bartok.debian.org: "Documentation: gluck:/org/admin.debian.org/doc/backup.debian.org"
@@ -73,33 +79,55 @@ footer:
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
   bugsmaster: rietz.debian.org
-  qamaster: merkel.debian.org
   mailrelay: spohr.debian.org
-  rtmaster: spohr.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
+  qamaster: merkel.debian.org
+  rtmaster: spohr.debian.org
 host_settings:
   heavy_exim:
-    - raff.debian.org
-    - gluck.debian.org
-    - merkel.debian.org
-    - spohr.debian.org
     - draghi.debian.org
+    - klecker.debian.org
     - master.debian.org
+    - merkel.debian.org
+    - powell.debian.org
+    - raff.debian.org
     - ries.debian.org
     - rietz.debian.org
-    - klecker.debian.org
-    - powell.debian.org
+    - spohr.debian.org
   apache2_defaultconfig:
+    - bellini.debian.org
     - carver.debian.org
+    - cimarosa.debian.org
     - draghi.debian.org
     - duarte.debian.org
+    - gluck.debian.org
+    - kaufmann.debian.org
+    - klecker.debian.org
+    - lobos.debian.org
     - piatti.debian.org
+    - raff.debian.org
+    - ravel.debian.org
     - rore.debian.org
     - saens.debian.org
     - samosa.debian.org
+    - schein.debian.org
     - senfl.debian.org
+    - spohr.debian.org
+    - steffani.debian.org
     - tartini.debian.org
+    - 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
@@ -110,18 +138,18 @@ host_settings:
     - lafayette.debian.org
     - malo.debian.org
     - murphy.debian.org
+    - paer.debian.org
     - praetorius.debian.org
     - puccini.debian.org
-    - paer.debian.org
   smarthost:
-    ancina.debian.org: mailout.debian.org
     allegri.debian.org: mailout.debian.org
+    ancina.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org
   mail_port:
-    ancina.debian.org: 2025
     allegri.debian.org: 2025
-    piatti.debian.org: 2025
+    ancina.debian.org: 2025
     kassia.debian.org: 587
+    piatti.debian.org: 2025
   reservedaddrs:
     ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 10.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"
 ---