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

[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 88913f7b82c4bd3d30654f2ab9a4e803ba528f3e..7e7b28b8af5a354e1cc2f9375f1bfe9605e5ebda 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -1,11 +1,17 @@
 ---
 nameinfo:
+  abel.debian.org: Carl Friedrich Abel (1723 - 1787)
   agnesi.debian.org: Maria Teresa Agnesi (October 17th, 1720 - January 19th, 1795)
   agricola.debian.org: Alexander Agricola (1445 or 1446 - August 15th, 1506)
+  alain.debian.org: Jehan Alain (1911 - 1940)
   albeniz.debian.org: Isaac Manuel Francisco Albéniz i Pascual (May 29th, 1860 - May 18th, 1909)
+  alwyn.debian.org: William Alwyn (1905 - 1985)
   ancina.debian.org: Giovanni Giovenale Ancina (October 19th, 1545 - August 30th, 1604)
+  antheil.debian.org: George Antheil (1900 - 1959)
   arcadelt.debian.org: Jacques Arcadelt (also Jacob Arcadelt) (?1507 - October 14th, 1568)
   argento.debian.org: Dominick Argento (b. October 27th, 1927)
+  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)
@@ -65,6 +71,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)
@@ -116,9 +124,9 @@ services:
     - spohr.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
@@ -130,6 +138,7 @@ host_settings:
     - busoni.debian.org
     - chopin.debian.org
     - draghi.debian.org
+    - franck.debian.org
     - grieg.debian.org
     - klecker.debian.org
     - master.debian.org
@@ -143,7 +152,6 @@ host_settings:
     - valente.debian.org
   apache2_security_mirror:
     - gluck.debian.org
-    - kassia.debian.org
     - lobos.debian.org
     - raff.debian.org
     - saens.debian.org
@@ -178,6 +186,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
@@ -192,13 +202,19 @@ host_settings:
     - field.debian.org
     - finzi.debian.org
   smarthost:
+    abel.debian.org: mailout.debian.org
     agnesi.debian.org: mailout.debian.org
     agricola.debian.org: mailout.debian.org
+    alain.debian.org: mailout.debian.org
     albeniz.debian.org: mailout.debian.org
     alkman.debian.org: mailout.debian.org
+    alwyn.debian.org: mailout.debian.org
     ancina.debian.org: mailout.debian.org
+    antheil.debian.org: mailout.debian.org
     arcadelt.debian.org: mailout.debian.org
     argento.debian.org: mailout.debian.org
+    arne.debian.org: mailout.debian.org
+    arnold.debian.org: mailout.debian.org
     ball.debian.org: mailout.debian.org
     barber.debian.org: mailout.debian.org
     bartok.debian.org: mailout.debian.org
@@ -260,6 +276,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
@@ -301,6 +319,7 @@ host_settings:
   no_munin:
     - agnesi.debian.org
     - allegri.debian.org
+    - byrd.debian.org
     - carver.debian.org
     - escher.debian.org
     - fano.debian.org
@@ -308,6 +327,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"