X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=79c8cc18a249d8ed97286fd79f05829361759908;hb=7004f4e0ff36511fdd02d6d16ce749f32a12588e;hp=9f99c14381aaf84f8ce4c954a6331b6cdd5e3b37;hpb=663f8ade60b07f58cce8163d5b579fd403a47432;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 9f99c1438..79c8cc18a 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -13,7 +13,6 @@ nameinfo:
   biber.debian.org: Heinrich Ignaz Franz von Biber (August 12th, 1664 - May 3rd, 1704)
   brahms.debian.org: Johannes Brahms (May 7th, 1833 - April 3rd, 1897)
   busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
-  byrd.debian.org: William Byrd (1543 - July 4th, 1623)
   carver.debian.org: Robert Carver (ca.1485 - ca.1570)
   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)
@@ -27,16 +26,19 @@ nameinfo:
   fasch.debian.org: Johann Friedrich Fasch (1688 - 1758)
   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)
   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)
   grieg.debian.org: Edvard Hagerup Grieg (June 15th, 1843 - September 4th, 1907)
   handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759)
+  heininen.debian.org: Paavo Heininen (January 13th, 1938)
   holter.debian.org: Iver Holter (December 13th, 1850 - January 27th, 1941)
   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 11th, 2000)
+  kokkonen.debian.org: November 13th, 1921 - October 1st, 1996)
   krenek.debian.org: Ernst Krenek (August 23rd, 1900 - December 22nd, 1991)
   lafayette.debian.org: Eugenie Lafayette
   lebrun.debian.org: Francesca Lebrun (March 24th, 1756 - May 14th, 1791)
@@ -53,6 +55,7 @@ nameinfo:
   monteverdi.debian.org: Claudio Giovanni Antonio Monteverdi (May 15th, 1567 - November 29, 1643)
   morricone.debian.org: Ennio Morricone (November 10th, 1928 - )
   mundy.debian.org: William Mundy (c. 1529 - 1591)
+  nielsen.debian.org: Carl August Nielsen (June 9th, 1865 - October 3rd, 1931)
   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)
@@ -62,6 +65,8 @@ nameinfo:
   pescetti.debian.org: Giovanni Battista Pescetti (ca. 1704  - 1766)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
   piatti.debian.org: Carlo Alfredo Piatti (January 8th, 1822 - July 18th, 1901)
+  polenc.debian.org: Francis Jean Marcel Poulenc (January 7, 1899 - January 30, 1963)
+  porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
   powell.debian.org: Andrew Powell (b. April 18th, 1949)
   praetorius.debian.org: Hieronymus Praetorius (August 10th, 1560 - January 27th, 1629)
   puccini.debian.org: Giacomo Antonio Domenico Michele Secondo Maria Puccini (December 22nd, 1858 - November 29th, 1924)
@@ -100,25 +105,22 @@ nameinfo:
   zandonai.debian.org: Riccardo Zandonai (May 30th, 1883 - June 5th, 1944)
   zelenka.debian.org: Jan Dismas Zelenka (October 16th, 1679 - December 23rd, 1745)
 footer:
-  lebrun.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
   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:
   bugsmaster:
-    - rietz.debian.org
   bugsmx:
     - busoni.debian.org
-    - byrd.debian.org
   dbmaster:
     - draghi.debian.org
   mailrelay:
     - draghi.debian.org
     - spohr.debian.org
-    - englund.debian.org
+    - merikanto.debian.org
   muninmaster: spohr.debian.org
-  nagiosmaster:
+  nagiosmaster: tchaikovsky.debian.org
+  extranrpeclient:
     - draghi.debian.org
-    - tchaikovsky.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
   puppetmaster: handel.debian.org
@@ -128,24 +130,22 @@ host_settings:
   heavy_exim:
     - bellini.debian.org
     - busoni.debian.org
-    - byrd.debian.org
     - chopin.debian.org
     - draghi.debian.org
+    - franck.debian.org
     - grieg.debian.org
     - klecker.debian.org
     - master.debian.org
+    - merikanto.debian.org
     - merkel.debian.org
     - morricone.debian.org
     - powell.debian.org
     - ravel.debian.org
     - ries.debian.org
-    - rietz.debian.org
     - spohr.debian.org
     - valente.debian.org
-    - englund.debian.org
   apache2_security_mirror:
     - gluck.debian.org
-    - kassia.debian.org
     - lobos.debian.org
     - raff.debian.org
     - saens.debian.org
@@ -172,6 +172,7 @@ host_settings:
     - goetz.debian.org
     - lafayette.debian.org
     - lebrun.debian.org
+    - lucatelli.debian.org
     - malo.debian.org
     - mayer.debian.org
     - mayr.debian.org
@@ -179,6 +180,8 @@ host_settings:
     - murphy.debian.org
     - penalosa.debian.org
     - peri.debian.org
+    - porpora.debian.org
+    - poulenc.debian.org
     - praetorius.debian.org
     - puccini.debian.org
     - purcell.debian.org
@@ -210,10 +213,11 @@ host_settings:
     carver.debian.org: mailout.debian.org
     cilea.debian.org: mailout.debian.org
     cimarosa.debian.org: mailout.debian.org
-    crest.debian.org: mailout.debian.org
     corelli.debian.org: mailout.debian.org
+    crest.debian.org: mailout.debian.org
     dijkstra.debian.org: mailout.debian.org
     duarte.debian.org: mailout.debian.org
+    englund.debian.org: mailout.debian.org
     escher.debian.org: mailout.debian.org
     fano.debian.org: mailout.debian.org
     fasch.debian.org: mailout.debian.org
@@ -227,26 +231,30 @@ host_settings:
     goedel.debian.org: mailout.debian.org
     goetz.debian.org: mailout.debian.org
     handel.debian.org: mailout.debian.org
+    heininen.debian.org: mailout.debian.org
     holter.debian.org: mailout.debian.org
     kassia.debian.org: mailout.debian.org
+    kaufmann.debian.org: mailout.debian.org
+    kokkonen.debian.org: mailout.debian.org
     krenek.debian.org: mailout.debian.org
     lafayette.debian.org: mailout.debian.org
     lebrun.debian.org: mailout.debian.org
     leisner.debian.org: mailout.debian.org
     lindberg.debian.org: mailout.debian.org
     lobos.debian.org: mailout.debian.org
+    lucatelli.debian.org: mailout.debian.org
     luchesi.debian.org: mailout.debian.org
     mahler.debian.org: mailout.debian.org
     malo.debian.org: mailout.debian.org
     mayer.debian.org: mailout.debian.org
     mayr.debian.org: mailout.debian.org
     mendes.debian.org: mailout.debian.org
-    merikanto.debian.org: mailout.debian.org
     merulo.debian.org: mailout.debian.org
     monteverdi.debian.org: mailout.debian.org
     morales.debian.org: mailout.debian.org
     mundy.debian.org: mailout.debian.org
     murphy.debian.org: mailout.debian.org
+    nielsen.debian.org: mailout.debian.org
     orff.debian.org: mailout.debian.org
     paer.debian.org: mailout.debian.org
     paganini.debian.org: mailout.debian.org
@@ -256,6 +264,8 @@ host_settings:
     pescetti.debian.org: mailout.debian.org
     pettersson.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org
+    porpora.debian.org: mailout.debian.org
+    poulenc.debian.org: mailout.debian.org
     praetorius.debian.org: mailout.debian.org
     puccini.debian.org: mailout.debian.org
     purcell.debian.org: mailout.debian.org
@@ -263,6 +273,7 @@ host_settings:
     rautavaara.debian.org: mailout.debian.org
     rem.debian.org: mailout.debian.org
     respighi.debian.org: mailout.debian.org
+    rietz.debian.org: mailout.debian.org
     rore.debian.org: mailout.debian.org
     saens.debian.org: mailout.debian.org
     scelsi.debian.org: mailout.debian.org
@@ -296,6 +307,7 @@ host_settings:
   no_munin:
     - agnesi.debian.org
     - allegri.debian.org
+    - byrd.debian.org
     - carver.debian.org
     - escher.debian.org
     - fano.debian.org
@@ -303,6 +315,7 @@ host_settings:
     - mahler.debian.org
     - malo.debian.org
     - mendes.debian.org
+    - monteverdi.debian.org
     - morales.debian.org
 #  reservedaddrs:
 #    ball.debian.org: "0.0.0.0/8 : 127.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"