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

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: (40 commits)
  somehow missed mayer
  fuck, really, stop
  stop including ferm for now
  apparently, puppet is not fond of sloppy line endings
  Revert "Revert "not breaking the paths in production branch maybe helps""
  try without extra whitespace
  Revert "not breaking the paths in production branch maybe helps"
  Revert "Revert "not breaking the paths in production branch maybe helps""
  Revert "not breaking the paths in production branch maybe helps"
  not breaking the paths in production branch maybe helps
  single quotes
  single quotes
  Revert "does that work?"
  does that work?
  Revert "maybe staging needs a default environment of staging?"
  the right path helps
  we lost two lines
  picky puppet
  ferm initial checkin
  Initial stab at adding a ferm module
  ...

diff --combined modules/debian-org/misc/local.yaml
index e70755bc0f53a6a2ca6e2a9e202748a014ad328f,b98e6d839ec7f62bd779980519a31eca75630344..f5c354373eb56a4444109251020e1ffd8382ccf1
--- 1/modules/debian-org/misc/local.yaml
--- 2/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -6,10 -6,8 +6,10 @@@ nameinfo
    ancina.debian.org: Giovanni Giovenale Ancina (19 October 1545 - August 30, 1604)
    arcadelt.debian.org: Jacques Arcadelt (also Jacob Arcadelt) (?1507 - October 14, 1568)
    argento.debian.org: Dominick Argento (b. October 27, 1927)
 +  barber.debian.org: Samuel Barber (1910 - 1981)
    bartok.debian.org: Béla Viktor János Bartók (March 25, 1881 - September 26, 1945)
    bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835)
 +  biber.debian.org: Heinrich Ignaz Franz von Biber (1664 - 1704)
    brahms.debian.org: Johannes Brahms (May 7, 1833 - April 3, 1897)
    busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1, 1866 - July 27, 1924)
    byrd.debian.org: William Byrd (1543 - 1623)
@@@ -24,6 -22,7 +24,7 @@@
    gluck.debian.org: Christoph Willibald Ritter von Gluck (2 July 1714 - 15 November 1787)
    goedel.debian.org: Kurt Gödel (April 28, 1906 - January 14, 1978)
    goetz.debian.org: Hermann Gustav Goetz (December 7, 1840 - December 3, 1876)
+   grieg.debian.org: Edvard Hagerup Grieg (15 June 1843 - 4 September 1907)
    handel.debian.org: Georg Friedrich Händel (23 February 1685 - 14 April 1759)
    kassia.debian.org: Kassia (between 805 and 810 - bef. 867)
    kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
@@@ -34,6 -33,7 +35,7 @@@
    luchesi.debian.org: Andrea Luca Luchesi (May 23, 1741 - March 21, 1801)
    mahler.debian.org: Gustav Mahler (7 July 1860 - 18 May 1911)
    mayr.debian.org: Johann(es) Simon Mayr (June 14, 1763 - December 2, 1845)
+   mayer.debian.org: John Mayer (October 28, 1930 - March 9, 2004)
    merkel.debian.org: Gustav (Adolf) Merkel (November 12, 1827 - October 30, 1885)
    mendes.debian.org: Manuel Mendes (c. 1547 - September 24, 1605)
    merulo.debian.org: Claudio Merulo (8 April 1533 - 4 May 1604)
@@@ -41,7 -41,6 +43,7 @@@
    morales.debian.org: Cristóbal de Morales (c. 1500 - between September 4 and October 7, 1553)
    morricone.debian.org: Ennio Morricone (November 10, 1928 - )
    mundy.debian.org: William Mundy (c. 1529 - 1591)
 +  orff.debian.org: Carl Orff (1895 - 1982)
    paer.debian.org: Ferdinando Paër (July 1, 1771 - May 3, 1839)
    paganini.debian.org: Niccolò Paganini (October 27, 1782 – May 27, 1840)
    penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1, 1528)
@@@ -54,11 -53,13 +56,13 @@@
    puccini.debian.org: Giacomo Antonio Domenico Michele Secondo Maria Puccini (December 22, 1858 - November 29, 1924)
    raff.debian.org: Joseph Joachim Raff (May 27, 1822 - June 24 or June 25, 1882)
    ravel.debian.org: Joseph-Maurice Ravel (March 7, 1875 - December 28, 1937)
+   rautavaara.debian.org: Einojuhani Rautavaara (born October 9, 1928)
    respighi.debian.org: Ottorino Respighi (July 9, 1879 - April 18, 1936)
    ries.debian.org: Franz Ries (1846 - 1932)
    rietz.debian.org: August Wilhelm Julius Rietz (December 28, 1812 - September 12, 1877)
    rore.debian.org: Cipriano de Rore (occasionally Cypriano) (1515 or 1516 - between September 11 and September 20, 1565)
    saens.debian.org: Charles-Camille Saint-Saëns  (9 October 1835 - 16 December 1921)
+   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.
    schein.debian.org: Johann Hermann Schein (January 20, 1586 - November 19, 1630)
    schroeder.debian.org: Hermann Schroeder (1904 - 1984)
    schumann.debian.org: Robert Alexander Schumann (8 June 1810 - 29 July 1856)
@@@ -132,6 -133,7 +136,7 @@@ host_settings
      - ancina.debian.org
      - arcadelt.debian.org
      - argento.debian.org
+     - ball.debian.org
      - brahms.debian.org
      - fano.debian.org
      - finzi.debian.org
@@@ -139,6 -141,7 +144,7 @@@
      - goetz.debian.org
      - lafayette.debian.org
      - malo.debian.org
+     - mayr.debian.org
      - murphy.debian.org
      - paer.debian.org
      - penalosa.debian.org
@@@ -160,6 -163,16 +166,16 @@@
      arcadelt.debian.org: mailout.debian.org
      argento.debian.org: mailout.debian.org
      bartok.debian.org: mailout.debian.org
+     blade0.debian.org: mailout.debian.org
+     blade1.debian.org: mailout.debian.org
+     blade2.debian.org: mailout.debian.org
+     blade3.debian.org: mailout.debian.org
+     blade4.debian.org: mailout.debian.org
+     blade5.debian.org: mailout.debian.org
+     blade6.debian.org: mailout.debian.org
+     blade7.debian.org: mailout.debian.org
+     blade8.debian.org: mailout.debian.org
+     blade9.debian.org: mailout.debian.org
      brahms.debian.org: mailout.debian.org
      caballero.debian.org: mailout.debian.org
      carver.debian.org: mailout.debian.org
@@@ -175,6 -188,7 +191,7 @@@
      gluck.debian.org: mailout.debian.org
      goedel.debian.org: mailout.debian.org
      goetz.debian.org: mailout.debian.org
+     grieg.debian.org: mailout.debian.org
      handel.debian.org: mailout.debian.org
      kassia.debian.org: mailout.debian.org
      lafayette.debian.org: mailout.debian.org
@@@ -202,6 -216,7 +219,7 @@@
      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
      rore.debian.org: mailout.debian.org
@@@ -223,8 -238,8 +241,8 @@@
      voltaire.debian.org: mailout.debian.org
      wieck.debian.org: mailout.debian.org
      wolkenstein.debian.org: mailout.debian.org
-     zee.debian.org: mailout.debian.org
      zandonai.debian.org: mailout.debian.org
+     zee.debian.org: mailout.debian.org
      zelenka.debian.org: mailout.debian.org
    mail_port:
      ancina.debian.org: 2025