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 71ddbf5329160be26d0bc09afa56513e1d4dbe1a..6e98dec2fee8e89b25e21b0fe4a64ee5719d8306 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -71,7 +71,6 @@ nameinfo:
   poulenc.debian.org: Francis Jean Marcel Poulenc (January 7, 1899 - January 30, 1963)
   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)
   raff.debian.org: Joseph Joachim Raff (May 27th, 1822 - June 24th or 25th, 1882)
   rautavaara.debian.org: Einojuhani Rautavaara (born October 9th, 1928)
   ravel.debian.org: Joseph-Maurice Ravel (March 7th, 1875 - December 28th, 1937)
@@ -79,7 +78,9 @@ nameinfo:
   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)
   saens.debian.org: Charles-Camille Saint-Saëns  (October 9th, 1835 - December 16th, 1921)
+  salieri.debian.org: Antonio Salieri (Legnago, 18 August 1750 - Vienna, 7 May 1825)
   samosa.debian.org: The samosa is a stuffed pastry and a popular snack in South Asia, Southeast Asia, Central Asia, the Arabian Peninsula, throughout the Mediterranean (Greece), Southwest Asia, the Horn of Africa and North Africa.
   scelsi.debian.org: Giacinto Scelsi (January 8th, 1905 - August 9th, 1988)
   schein.debian.org: Johann Hermann Schein (January 20th, 1586 - November 19th, 1630)
@@ -96,6 +97,7 @@ nameinfo:
   steffani.debian.org: Agostino Steffani (July 25th, 1653 - February 12th, 1728)
   tartini.debian.org: Giuseppe Tartini (April 8th, 1692 - February 26th, 1770)
   tchaikovsky.debian.org: Pyotr Ilyich Tchaikovsky (Пётр Ильич Чайковский) (May 7th, 1840 - November 6th, 1893)
+  traetta.debian.org: Tommaso Michele Francesco Saverio Traetta (30 March 1727 - 6 April 1779)
   unger.debian.org: Caroline Unger (October 28th, 1803 - March 23th, 1877)
   valente.debian.org: Vincenzo Valente (February 21st, 1855 - September 6th, 1921)
   vitry.debian.org: Philippe de Vitry (October 31st, 1291 - June 9th, 1361)
@@ -143,7 +145,6 @@ host_settings:
     - morricone.debian.org
     - powell.debian.org
     - ravel.debian.org
-    - ries.debian.org
     - spohr.debian.org
     - valente.debian.org
   apache2_security_mirror:
@@ -190,7 +191,6 @@ host_settings:
     - porpora.debian.org
     - poulenc.debian.org
     - praetorius.debian.org
-    - puccini.debian.org
     - rem.debian.org
     - schroeder.debian.org
     - spontini.debian.org
@@ -275,14 +275,16 @@ host_settings:
     porpora.debian.org: mailout.debian.org
     poulenc.debian.org: mailout.debian.org
     praetorius.debian.org: mailout.debian.org
-    puccini.debian.org: mailout.debian.org
     raff.debian.org: mailout.debian.org
     rautavaara.debian.org: mailout.debian.org
     rem.debian.org: mailout.debian.org
     respighi.debian.org: mailout.debian.org
+    ries.debian.org: mailout.debian.org
     rietz.debian.org: mailout.debian.org
     rore.debian.org: mailout.debian.org
+    rossini.debian.org: mailout.debian.org
     saens.debian.org: mailout.debian.org
+    salieri.debian.org: mailout.debian.org
     scelsi.debian.org: mailout.debian.org
     schein.debian.org: mailout.debian.org
     schroeder.debian.org: mailout.debian.org
@@ -296,6 +298,7 @@ host_settings:
     stabile.debian.org: mailout.debian.org
     steffani.debian.org: mailout.debian.org
     tchaikovsky.debian.org: mailout.debian.org
+    traetta.debian.org: mailout.debian.org
     unger.debian.org: mailout.debian.org
     villa.debian.org: mailout.debian.org
     vitry.debian.org: mailout.debian.org
@@ -314,7 +317,6 @@ host_settings:
   no_munin:
     - agnesi.debian.org
     - allegri.debian.org
-    - byrd.debian.org
     - escher.debian.org
     - fano.debian.org
     - malo.debian.org