X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=189a6f2d338f65b63b0d438440c2d97f3efaa1db;hb=f663f54583fe6542d5928cfce3ad29cd3672da3b;hp=18e39e4c8d9bc1fa95803e1362092a53bfc4f8f4;hpb=67baac760e471d59c763dd17317fcdbd762a8f68;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 18e39e4c8..189a6f2d3 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -1,7 +1,6 @@
 ---
 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)
@@ -13,17 +12,22 @@ nameinfo:
   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)
+  barriere.debian.org: Jean-Baptiste Barrière (May 2nd, 1707 - June 6th, 1747)
   beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827)
   bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835)
+  bendel.debian.org: Franz Bendel (March 23, 1833 - July 3, 1874)
   berlioz.debian.org: Hector Berlioz (December 11th, 1803 - March 8th, 1869)
   biber.debian.org: Heinrich Ignaz Franz von Biber (August 12th, 1664 - May 3rd, 1704)
+  bizet.debian.org: Georges Bizet, (October 25th, 1838 - June 3rd, 1875)
+  blavet.debian.org: Michel Blavet (March 13, 1700 - October 28, 1768)
   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)
   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)
   corelli.debian.org: Arcangelo Corelli (February 17th, 1653 - January 8th, 1713)
+  czerny.debian.org: Carl Czerny (February 21st, 1791 - July 15th, 1857)
   danzi.debian.org: Franz Ignaz Danzi (June 15th, 1763 - April 13th, 1826)
+  diabelli.debian.org: Anton Diabelli (September 5th, 1781 - April 7th, 1858)
   diamond.debian.org: David Leo Diamond (July 9, 1915 - June 13, 2005)
   dijkstra.debian.org: Lowell Dijkstra (b.1952)
   draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700)
@@ -42,7 +46,6 @@ nameinfo:
   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)
   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)
@@ -79,18 +82,19 @@ nameinfo:
   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)
+  parry.debian.org: Sir Charles Hubert Hastings Parry, 1st Baronet (February 27th, 1848 – October 7th, 1918)
+  partch.debian.org: Harry Partch (June 24th, 1901 – September 3rd, 1974)
   penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1st, 1528)
   pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736)
   peri.debian.org: Jacopo Peri (August 20th, 1561 - August 12th, 1633)
-  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)
+  piston.debian.org: Walter Hamor Piston Jr. (January 20th, 1894 – November 12th, 1976)
   porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
   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)
   quantz.debian.org: Johann Joachim Quantz (January 30th, 1697 - July 12th, 1773)
-  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)
   respighi.debian.org: Ottorino Respighi (July 9th, 1879 - April 18th, 1936)
@@ -107,11 +111,12 @@ nameinfo:
   schein.debian.org: Johann Hermann Schein (January 20th, 1586 - November 19th, 1630)
   schroeder.debian.org: Hermann Schroeder (March 26th, 1904 - October 7th, 1984)
   schumann.debian.org: Robert Alexander Schumann (June 8th, 1810 - July 29th, 1856)
-  schuetz.debian.org: Heinrich Schütz (October 8th, 1585 - November 6th, 1672)
   senfl.debian.org: Ludwig Senfl (~1490 - ~1543)
   sibelius.debian.org: Jean Sibelius (December 8th, 1865 - September 20th, 1957)
   smetana.debian.org: Bedřich Smetana (March 2nd, 1824 - May 12th, 1884)
   soler.debian.org: Padre Antonio Soler (December 3rd, 1729 (baptized) - December 20th, 1783)
+  sompek.debian.org: Ernst Sompek (Juni 11th 1876 - August 2nd 1954)
+  stadler.debian.org: Maximilian Johann Karl Dominik Stadler, Abbé Stadler (August 4th 1748 - November 8th 1833)
   sperger.debian.org: Johannes Matthias Sperger (March 23th, 1750 - May 13th, 1812)
   spohr.debian.org: Louis Spohr (April 5th, 1784 - October 22nd, 1859)
   spontini.debian.org: Gaspare Luigi Pacifico Spontini (November 14th, 1774 - January 24th, 1851)
@@ -129,10 +134,13 @@ nameinfo:
   wieck.debian.org: Clara Josephine Wieck (September 13th, 1819 - May 20th, 1896)
   wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
   zandonai.debian.org: Riccardo Zandonai (May 30th, 1883 - June 5th, 1944)
+  zappa.debian.org: Frank Vincent Zappa (December 21st, 1940 - December 4th, 1993)
   zelenka.debian.org: Jan Dismas Zelenka (October 16th, 1679 - December 23rd, 1745)
+  zemlinsky.debian.org: Alexander von Zemlinsky (October 14th, 1871 - March 15th 1942)
 footer:
-  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]"
+  dummy: foo
+  #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:
   bugsmx:
@@ -142,24 +150,26 @@ services:
   mailrelay:
     - kokkonen.debian.org
     - merikanto.debian.org
-  muninmaster: spohr.debian.org
+  muninmaster:
+    - spohr.debian.org
   nagiosmaster: tchaikovsky.debian.org
   extranrpeclient:
     - orff.debian.org
   packagesmaster: powell.debian.org
-  packagesqamaster: master.debian.org
+  packagesqamaster: quantz.debian.org
   puppetmaster: handel.debian.org
   rtmaster:
     - reger.debian.org
 host_settings:
   heavy_exim:
     - bellini.debian.org
+    - bizet.debian.org
     - busoni.debian.org
     - chopin.debian.org
     - draghi.debian.org
     - franck.debian.org
+    - gombert.debian.org
     - grieg.debian.org
-    - klecker.debian.org
     - kokkonen.debian.org
     - master.debian.org
     - merikanto.debian.org
@@ -184,22 +194,43 @@ host_settings:
     - bellini.debian.org
     - englund.debian.org
     - gluck.debian.org
-    - klecker.debian.org
     - kokkonen.debian.org
     - senfl.debian.org
     - santoro.debian.org
   'apache2_ftp-upcoming_mirror':
-    - rietz.debian.org
     - kassia.debian.org
+    - klecker.debian.org
     - merikanto.debian.org
+    - rietz.debian.org
   apache2_backports_mirror:
+    - bizet.debian.org
     - englund.debian.org
     - morricone.debian.org
   timeserver:
+    - busoni.debian.org
     - merikanto.debian.org
     - orff.debian.org
     - ravel.debian.org
-    - busoni.debian.org
+  broken-rtc:
+    - abel.debian.org
+    - alain.debian.org
+    - alwyn.debian.org
+    - ancina.debian.org
+    - antheil.debian.org
+    - arne.debian.org
+    - arnold.debian.org
+    - ball.debian.org
+    - harris.debian.org
+    - hartmann.debian.org
+    - hasse.debian.org
+    - hebden.debian.org
+    - henze.debian.org
+    - hildegard.debian.org
+    - hoiby.debian.org
+    - howells.debian.org
+    - hummel.debian.org
+    - lucatelli.debian.org
+    - rem.debian.org
   buildd:
     - alain.debian.org
     - alkman.debian.org
@@ -220,12 +251,15 @@ host_settings:
     - fasch.debian.org
     - field.debian.org
     - finzi.debian.org
-    - goedel.debian.org
     - goetz.debian.org
     - hartmann.debian.org
     - hasse.debian.org
     - hebden.debian.org
     - henze.debian.org
+    - hildegard.debian.org
+    - hoiby.debian.org
+    - howells.debian.org
+    - hummel.debian.org
     - krenek.debian.org
     - lebrun.debian.org
     - lucatelli.debian.org
@@ -233,6 +267,7 @@ host_settings:
     - mayr.debian.org
     - mundy.debian.org
     - murphy.debian.org
+    - parry.debian.org
     - penalosa.debian.org
     - peri.debian.org
     - porpora.debian.org
@@ -240,136 +275,135 @@ host_settings:
     - praetorius.debian.org
     - rem.debian.org
     - schroeder.debian.org
+    - sompek.debian.org
     - spontini.debian.org
+    - stadler.debian.org
     - vitry.debian.org
     - zandonai.debian.org
-    - zee.debian.org
-  wheezy:
-    - harris.debian.org
-    - hartmann.debian.org
-    - hasse.debian.org
-    - hebden.debian.org
-    - henze.debian.org
-    - hoiby.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
-    - bellini.debian.org
-    - berlioz.debian.org
-    - biber.debian.org
-    - brahms.debian.org
-    - busoni.debian.org
-    - byrd.debian.org
-    - caballero.debian.org
-    - chopin.debian.org
-    - cilea.debian.org
-    - danzi.debian.org
-    - diamond.debian.org
-    - dijkstra.debian.org
-    - draghi.debian.org
-    - duarte.debian.org
-    - dukas.debian.org
-    - eder.debian.org
-    - elgar.debian.org
-    - englund.debian.org
-    - eysler.debian.org
-    - fano.debian.org
-    - fasch.debian.org
-    - field.debian.org
-    - finzi.debian.org
-    - franck.debian.org
-    - geo1.debian.org
-    - geo2.debian.org
-    - geo3.debian.org
-    - glinka.debian.org
-    - gluck.debian.org
-    - gombert.debian.org
-    - grieg.debian.org
-    - handel.debian.org
-    - heininen.debian.org
-    - holter.debian.org
-    - jenkins.debian.org
-    - kassia.debian.org
-    - kaufmann.debian.org
-    - kokkonen.debian.org
-    - krenek.debian.org
-    - lamb.debian.org
-    - lebrun.debian.org
-    - lindberg.debian.org
-    - lobos.debian.org
-    - locke.debian.org
-    - lotti.debian.org
-    - luchesi.debian.org
-    - master.debian.org
-    - merikanto.debian.org
-    - merulo.debian.org
-    - morricone.debian.org
-    - mundy.debian.org
-    - murphy.debian.org
-    - nono.debian.org
-    - orff.debian.org
-    - paganini.debian.org
-    - pescetti.debian.org
-    - pergolesi.debian.org
-    - pettersson.debian.org
-    - piatti.debian.org
-    - porpora.debian.org
-    - poulenc.debian.org
-    - praetorius.debian.org
-    - quantz.debian.org
-    - raff.debian.org
-    - rautavaara.debian.org
-    - ravel.debian.org
-    - reger.debian.org
-    - rem.debian.org
-    - respighi.debian.org
-    - ries.debian.org
-    - rietz.debian.org
-    - rore.debian.org
-    - rossini.debian.org
-    - saens.debian.org
-    - salieri.debian.org
-    - samosa.debian.org
-    - santoro.debian.org
-    - scelsi.debian.org
-    - schein.debian.org
-    - schroeder.debian.org
-    - schuetz.debian.org
-    - schumann.debian.org
-    - senfl.debian.org
-    - sibelius.debian.org
-    - smetana.debian.org
-    - soler.debian.org
-    - sperger.debian.org
-    - spohr.debian.org
-    - spontini.debian.org
-    - stabile.debian.org
-    - steffani.debian.org
-    - tchaikovsky.debian.org
-    - traetta.debian.org
-    - tye.debian.org
-    - unger.debian.org
-    - villa.debian.org
-    - vitry.debian.org
-    - vivaldi.debian.org
-    - widor.debian.org
-    - wieck.debian.org
-    - zandonai.debian.org
-    - zelenka.debian.org
+    - zappa.debian.org
+    - zemlinsky.debian.org
+  #wheezy:
+  #  - harris.debian.org
+  #  - hartmann.debian.org
+  #  - hasse.debian.org
+  #  - hebden.debian.org
+  #  - henze.debian.org
+  #  - hoiby.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
+  #  - bellini.debian.org
+  #  - berlioz.debian.org
+  #  - biber.debian.org
+  #  - brahms.debian.org
+  #  - busoni.debian.org
+  #  - caballero.debian.org
+  #  - chopin.debian.org
+  #  - cilea.debian.org
+  #  - danzi.debian.org
+  #  - diamond.debian.org
+  #  - dijkstra.debian.org
+  #  - draghi.debian.org
+  #  - duarte.debian.org
+  #  - dukas.debian.org
+  #  - eder.debian.org
+  #  - elgar.debian.org
+  #  - englund.debian.org
+  #  - eysler.debian.org
+  #  - fano.debian.org
+  #  - fasch.debian.org
+  #  - field.debian.org
+  #  - finzi.debian.org
+  #  - franck.debian.org
+  #  - geo1.debian.org
+  #  - geo2.debian.org
+  #  - geo3.debian.org
+  #  - glinka.debian.org
+  #  - gluck.debian.org
+  #  - gombert.debian.org
+  #  - grieg.debian.org
+  #  - handel.debian.org
+  #  - heininen.debian.org
+  #  - holter.debian.org
+  #  - jenkins.debian.org
+  #  - kassia.debian.org
+  #  - kaufmann.debian.org
+  #  - kokkonen.debian.org
+  #  - krenek.debian.org
+  #  - lamb.debian.org
+  #  - lebrun.debian.org
+  #  - lindberg.debian.org
+  #  - lobos.debian.org
+  #  - locke.debian.org
+  #  - lotti.debian.org
+  #  - luchesi.debian.org
+  #  - master.debian.org
+  #  - merikanto.debian.org
+  #  - merulo.debian.org
+  #  - morricone.debian.org
+  #  - mundy.debian.org
+  #  - murphy.debian.org
+  #  - nono.debian.org
+  #  - orff.debian.org
+  #  - paganini.debian.org
+  #  - pergolesi.debian.org
+  #  - pettersson.debian.org
+  #  - piatti.debian.org
+  #  - porpora.debian.org
+  #  - poulenc.debian.org
+  #  - praetorius.debian.org
+  #  - quantz.debian.org
+  #  - rautavaara.debian.org
+  #  - ravel.debian.org
+  #  - reger.debian.org
+  #  - rem.debian.org
+  #  - respighi.debian.org
+  #  - ries.debian.org
+  #  - rietz.debian.org
+  #  - rore.debian.org
+  #  - rossini.debian.org
+  #  - saens.debian.org
+  #  - salieri.debian.org
+  #  - samosa.debian.org
+  #  - santoro.debian.org
+  #  - scelsi.debian.org
+  #  - schein.debian.org
+  #  - schroeder.debian.org
+  #  - schumann.debian.org
+  #  - senfl.debian.org
+  #  - sibelius.debian.org
+  #  - smetana.debian.org
+  #  - soler.debian.org
+  #  - sperger.debian.org
+  #  - spohr.debian.org
+  #  - spontini.debian.org
+  #  - stabile.debian.org
+  #  - steffani.debian.org
+  #  - tchaikovsky.debian.org
+  #  - traetta.debian.org
+  #  - tye.debian.org
+  #  - unger.debian.org
+  #  - villa.debian.org
+  #  - vitry.debian.org
+  #  - vivaldi.debian.org
+  #  - widor.debian.org
+  #  - wieck.debian.org
+  #  - wolkenstein.debian.org
+  #  - zandonai.debian.org
+  #  - zelenka.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
@@ -383,16 +417,19 @@ host_settings:
     arnold.debian.org: mailout.debian.org
     ball.debian.org: mailout.debian.org
     barber.debian.org: mailout.debian.org
+    barriere.debian.org: mailout.debian.org
     beethoven.debian.org: mailout.debian.org
     berlioz.debian.org: mailout.debian.org
     biber.debian.org: mailout.debian.org
+    blavet.debian.org: mailout.debian.org
     brahms.debian.org: mailout.debian.org
-    byrd.debian.org: mailout.debian.org
     caballero.debian.org: mailout.debian.org
     cilea.debian.org: mailout.debian.org
     corelli.debian.org: mailout.debian.org
     crest.debian.org: mailout.debian.org
+    czerny.debian.org: mailout.debian.org
     danzi.debian.org: mailout.debian.org
+    diabelli.debian.org: mailout.debian.org
     diamond.debian.org: mailout.debian.org
     dijkstra.debian.org: mailout.debian.org
     duarte.debian.org: mailout.debian.org
@@ -411,9 +448,7 @@ host_settings:
     geo3.debian.org: mailout.debian.org
     glinka.debian.org: mailout.debian.org
     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
     harris.debian.org: mailout.debian.org
     hartmann.debian.org: mailout.debian.org
@@ -421,14 +456,18 @@ host_settings:
     hebden.debian.org: mailout.debian.org
     heininen.debian.org: mailout.debian.org
     henze.debian.org: mailout.debian.org
+    hildegard.debian.org: mailout.debian.org
     hoiby.debian.org: mailout.debian.org
     holter.debian.org: mailout.debian.org
+    howells.debian.org: mailout.debian.org
+    hummel.debian.org: mailout.debian.org
     jenkins.debian.org: mailout.debian.org
     kassia.debian.org: mailout.debian.org
     kaufmann.debian.org: mailout.debian.org
+    klecker.debian.org: mailout.debian.org
     krenek.debian.org: mailout.debian.org
-    lamb.debian.org: mailout.debian.org
     lafayette.debian.org: mailout.debian.org
+    lamb.debian.org: mailout.debian.org
     lebrun.debian.org: mailout.debian.org
     leisner.debian.org: mailout.debian.org
     lindberg.debian.org: mailout.debian.org
@@ -443,20 +482,22 @@ host_settings:
     merulo.debian.org: mailout.debian.org
     mundy.debian.org: mailout.debian.org
     murphy.debian.org: mailout.debian.org
+    new-master.debian.org: mailout.debian.org
     nielsen.debian.org: mailout.debian.org
     orff.debian.org: mailout.debian.org
     paer.debian.org: mailout.debian.org
+    parry.debian.org: mailout.debian.org
+    partch.debian.org: mailout.debian.org
     paganini.debian.org: mailout.debian.org
     penalosa.debian.org: mailout.debian.org
     pergolesi.debian.org: mailout.debian.org
     peri.debian.org: mailout.debian.org
-    pescetti.debian.org: mailout.debian.org
     pettersson.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org
+    piston.debian.org: mailout.debian.org
     porpora.debian.org: mailout.debian.org
     poulenc.debian.org: mailout.debian.org
     praetorius.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
@@ -471,14 +512,15 @@ host_settings:
     schein.debian.org: mailout.debian.org
     schroeder.debian.org: mailout.debian.org
     schumann.debian.org: mailout.debian.org
-    schuetz.debian.org: mailout.debian.org
     senfl.debian.org: mailout.debian.org
     sibelius.debian.org: mailout.debian.org
     smetana.debian.org: mailout.debian.org
     soler.debian.org: mailout.debian.org
+    sompek.debian.org: mailout.debian.org
     sperger.debian.org: mailout.debian.org
     spontini.debian.org: mailout.debian.org
     stabile.debian.org: mailout.debian.org
+    stadler.debian.org: mailout.debian.org
     steffani.debian.org: mailout.debian.org
     tchaikovsky.debian.org: mailout.debian.org
     traetta.debian.org: mailout.debian.org
@@ -489,14 +531,16 @@ host_settings:
     widor.debian.org: mailout.debian.org
     wieck.debian.org: mailout.debian.org
     zandonai.debian.org: mailout.debian.org
-    zee.debian.org: mailout.debian.org
+    zappa.debian.org: mailout.debian.org
     zelenka.debian.org: mailout.debian.org
+    zemlinsky.debian.org: mailout.debian.org
   mail_port:
     ancina.debian.org: 2025
     kassia.debian.org: 587
+    klecker.debian.org: 587
     piatti.debian.org: 2025
+    zappa.debian.org: 587
   no_munin:
-    - agnesi.debian.org
     - allegri.debian.org
     - escher.debian.org
     - fano.debian.org