X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=509023c876cd4520ff5263833aba42f6f4b18f19;hb=330a065899f896b7b6e1ea737c1d3be02b382f41;hp=f1eb152a2afd32e3c77baeb390d20a881643f7d5;hpb=60e980e0c79b748f0c901cbcf3c2e933dbe81968;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index f1eb152a2..509023c87 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -13,7 +13,6 @@ nameinfo:
   arne.debian.org: Thomas Augustine Arne (1710 - 1778)
   arnold.debian.org: Malcolm Henry Arnold (1921 - 2006)
   barber.debian.org: Samuel Barber (March 9th, 1910 - January 23rd, 1981)
-  bartok.debian.org: Béla Viktor János Bartók (March 25th, 1881 - September 26th, 1945)
   beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827)
   bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835)
   biber.debian.org: Heinrich Ignaz Franz von Biber (August 12th, 1664 - May 3rd, 1704)
@@ -22,8 +21,8 @@ nameinfo:
   byrd.debian.org: William Byrd (1543 - July 4th, 1623)
   chopin.debian.org: Frédéric Chopin (March 1st, 1810 - October 17th, 1849)
   cilea.debian.org: Francesco Cilèa (July 26th, 1866 - November 20th, 1950)
-  cimarosa.debian.org: Domenico Cimarosa (17 December 1749 - 11 January 1801)
-  corelli.debian.org: Arcangelo Corelli (February 17th, 1653 – January 8th, 1713)
+  corelli.debian.org: Arcangelo Corelli (February 17th, 1653 - January 8th, 1713)
+  danzi.debian.org: Franz Ignaz Danzi (June 15th, 1763 - April 13th, 1826)
   dijkstra.debian.org: Lowell Dijkstra (b.1952)
   draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700)
   duarte.debian.org: Leonora Duarte (July 28th, 1610 - 1678)
@@ -33,7 +32,7 @@ nameinfo:
   field.debian.org: John Field (1782 - 1837)
   finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
   franck.debian.org: Melchior Franck (1579 - June 1st, 1639)
-  gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 – July 10th, 1690)
+  gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 - July 10th, 1690)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
   goedel.debian.org: Kurt Gödel (April 28th, 1906 - January 14th, 1978)
   goetz.debian.org: Hermann Gustav Goetz (December 7th, 1840 - December 3rd, 1876)
@@ -65,7 +64,7 @@ nameinfo:
   nono.debian.org: Luigi Nono (January 29, 1924 - May 8, 1990)
   orff.debian.org: Carl Orff (July 10th, 1895 - March 29th, 1982)
   paer.debian.org: Ferdinando Paër (July 1st, 1771 - May 3rd, 1839)
-  paganini.debian.org: Niccolò Paganini (October 27th, 1782 – May 27th, 1840)
+  paganini.debian.org: Niccolò Paganini (October 27th, 1782 - May 27th, 1840)
   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)
@@ -82,7 +81,7 @@ nameinfo:
   ravel.debian.org: Joseph-Maurice Ravel (March 7th, 1875 - December 28th, 1937)
   respighi.debian.org: Ottorino Respighi (July 9th, 1879 - April 18th, 1936)
   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)
+  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 29, 1792 - November 13, 1868)
@@ -137,7 +136,6 @@ services:
   puppetmaster: handel.debian.org
   qamaster: merkel.debian.org
   rtmaster: 
-    - spohr.debian.org
     - reger.debian.org
 host_settings:
   heavy_exim:
@@ -155,19 +153,27 @@ host_settings:
     - morricone.debian.org
     - nono.debian.org
     - powell.debian.org
+    - quantz.debian.org
     - ravel.debian.org
+    - reger.debian.org
     - spohr.debian.org
     - valente.debian.org
-    - quantz.debian.org
   apache2_security_mirror:
     - gluck.debian.org
     - lobos.debian.org
-    - raff.debian.org
     - saens.debian.org
     - schein.debian.org
     - steffani.debian.org
     - villa.debian.org
     - wieck.debian.org
+  apache2_www_mirror:
+    - bellini.debian.org
+    - englund.debian.org
+    - gluck.debian.org
+    - klecker.debian.org
+    - kokkonen.debian.org
+    - senfl.debian.org
+    - wolkenstein.debian.org
   timeserver:
     - merikanto.debian.org
     - orff.debian.org
@@ -215,20 +221,26 @@ host_settings:
     - voltaire.debian.org
     - zandonai.debian.org
   squeeze:
+    - arne.debian.org
+    - byrd.debian.org
+    - danzi.debian.org
     - fano.debian.org
     - fasch.debian.org
     - field.debian.org
     - finzi.debian.org
-    - byrd.debian.org
     - lamb.debian.org
     - locke.debian.org
     - lotti.debian.org
-    - rautavaara.debian.org
-    - schuetz.debian.org
-    - salieri.debian.org
+    - nono.debian.org
     - quantz.debian.org
+    - raff.debian.org
+    - rautavaara.debian.org
     - reger.debian.org
-    - nono.debian.org
+    - rem.debian.org
+    - salieri.debian.org
+    - schuetz.debian.org
+    - sibelius.debian.org
+    - spohr.debian.org
   smarthost:
     abel.debian.org: mailout.debian.org
     agnesi.debian.org: mailout.debian.org
@@ -245,16 +257,15 @@ host_settings:
     arnold.debian.org: mailout.debian.org
     ball.debian.org: mailout.debian.org
     barber.debian.org: mailout.debian.org
-    bartok.debian.org: mailout.debian.org
     beethoven.debian.org: mailout.debian.org
     biber.debian.org: mailout.debian.org
     brahms.debian.org: mailout.debian.org
     byrd.debian.org: mailout.debian.org
     caballero.debian.org: mailout.debian.org
     cilea.debian.org: mailout.debian.org
-    cimarosa.debian.org: mailout.debian.org
     corelli.debian.org: mailout.debian.org
     crest.debian.org: mailout.debian.org
+    danzi.debian.org: mailout.debian.org
     dijkstra.debian.org: mailout.debian.org
     duarte.debian.org: mailout.debian.org
     englund.debian.org: mailout.debian.org