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 d2cfa3510eb098e241dfe06b4f3a5e140380005c..1c557c5b541dcd4658a011375f66942caacaf3bd 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -38,6 +38,7 @@ nameinfo:
   gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 - July 10th, 1690)
   glinka.debian.org: Mikhail Ivanovich Glinka (1804 - 1857)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
+  gombert.debian.org: Nicolas Gombert (c. 1495 – c. 1560)
   dukas.debian.org: Paul Dukas (1865 - 1935)
   goedel.debian.org: Kurt Gödel (April 28th, 1906 - January 14th, 1978)
   goetz.debian.org: Hermann Gustav Goetz (December 7th, 1840 - December 3rd, 1876)
@@ -61,7 +62,6 @@ nameinfo:
   mayer.debian.org: John Mayer (October 28th, 1930 - March 9th, 2004)
   mayr.debian.org: Johann(es) Simon Mayr (June 14th, 1763 - December 2nd, 1845)
   merikanto.debian.org: Oskar Merikanto (August 5th, 1868 - February 17th, 1924)
-  merkel.debian.org: Gustav (Adolf) Merkel (November 12th, 1827 - October 30th, 1885)
   merulo.debian.org: Claudio Merulo (April 8th, 1533 - May 4th, 1604)
   morricone.debian.org: Ennio Morricone (November 10th, 1928 - )
   mundy.debian.org: William Mundy (c. 1529 - 1591)
@@ -116,7 +116,6 @@ nameinfo:
   valente.debian.org: Vincenzo Valente (February 21st, 1855 - September 6th, 1921)
   vitry.debian.org: Philippe de Vitry (October 31st, 1291 - June 9th, 1361)
   vivaldi.debian.org: Antonio Lucio Vivaldi (March 4th, 1678 - July 28th, 1741)
-  voltaire.debian.org: François-Marie Arouet (Voltaire) (November 21st, 1694 - May 30th, 1778)
   widor.debian.org: Charles-Marie Jean Albert Widor (February 21st, 1844 - March 12th, 1937)
   wieck.debian.org: Clara Josephine Wieck (September 13th, 1819 - May 20th, 1896)
   wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
@@ -141,7 +140,6 @@ services:
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
   puppetmaster: handel.debian.org
-  qamaster: merkel.debian.org
   rtmaster: 
     - reger.debian.org
 host_settings:
@@ -156,7 +154,6 @@ host_settings:
     - kokkonen.debian.org
     - master.debian.org
     - merikanto.debian.org
-    - merkel.debian.org
     - morricone.debian.org
     - nono.debian.org
     - powell.debian.org
@@ -231,12 +228,19 @@ host_settings:
     - schroeder.debian.org
     - spontini.debian.org
     - vitry.debian.org
-    - voltaire.debian.org
     - zandonai.debian.org
     - zee.debian.org
   squeeze:
+    - abel.debian.org
+    - agricola.debian.org
+    - alain.debian.org
     - alkman.debian.org
+    - alwyn.debian.org
+    - antheil.debian.org
+    - arcadelt.debian.org
+    - argento.debian.org
     - arne.debian.org
+    - arnold.debian.org
     - ball.debian.org
     - barber.debian.org
     - beethoven.debian.org
@@ -246,6 +250,7 @@ host_settings:
     - brahms.debian.org
     - busoni.debian.org
     - byrd.debian.org
+    - caballero.debian.org
     - chopin.debian.org
     - cilea.debian.org
     - danzi.debian.org
@@ -266,6 +271,7 @@ host_settings:
     - geo3.debian.org
     - glinka.debian.org
     - gluck.debian.org
+    - gombert.debian.org
     - grieg.debian.org
     - handel.debian.org
     - heininen.debian.org
@@ -283,6 +289,7 @@ host_settings:
     - luchesi.debian.org
     - master.debian.org
     - merikanto.debian.org
+    - merulo.debian.org
     - morricone.debian.org
     - mundy.debian.org
     - murphy.debian.org
@@ -331,7 +338,7 @@ host_settings:
     - unger.debian.org
     - villa.debian.org
     - vitry.debian.org
-    - voltaire.debian.org
+    - vivaldi.debian.org
     - widor.debian.org
     - wieck.debian.org
     - zandonai.debian.org
@@ -380,6 +387,7 @@ host_settings:
     gluck.debian.org: mailout.debian.org
     goedel.debian.org: mailout.debian.org
     goetz.debian.org: mailout.debian.org
+    gombert.debian.org: mailout.debian.org
     handel.debian.org: mailout.debian.org
     heininen.debian.org: mailout.debian.org
     holter.debian.org: mailout.debian.org
@@ -445,7 +453,6 @@ host_settings:
     villa.debian.org: mailout.debian.org
     vitry.debian.org: mailout.debian.org
     vivaldi.debian.org: mailout.debian.org
-    voltaire.debian.org: mailout.debian.org
     widor.debian.org: mailout.debian.org
     wieck.debian.org: mailout.debian.org
     zandonai.debian.org: mailout.debian.org