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 52fccf1c7c224a379ce1f86673dec63471732596..1c557c5b541dcd4658a011375f66942caacaf3bd 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -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)
@@ -229,15 +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
@@ -247,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
@@ -285,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
@@ -333,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
@@ -448,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