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: (26 commits)
  Another file that may be changed by puppet to ignore
  Maybe we don't need the sleep
  eh, duh.  Need sudo for this.
  Try a longer wait?
  wait a moment after running reconfig, so that the reload works
  more accurate error message
  Move reject of localonly users to predata.  This allows callouts to
  We push this with a Makefile for now
  Correct the name to samhain ignore
  Move the config file snippet to the top
  Fix the posthooks
  Revert "we should also samhain ignore that file"
  Revert "And it's directory"
  Change path to geo file
  Add my key
  Some tightening up
  Rename the views so I don't have to make code changes
  Well, there's only one way to figure out if this will work
  And allow the postcommand
  Also autogenerate bind config snippets
  ...

diff --combined modules/debian-org/misc/local.yaml
index 7323606842c76e51ba714951d2d250ef1bbf3833,46ee1abe73fd3d5925fcde4ab34a8d04bc67857e..8206d68a3d6741551fb5b4fc88e30e3916d1ee6b
--- 1/modules/debian-org/misc/local.yaml
--- 2/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -1,7 -1,9 +1,9 @@@
  ---
  nameinfo:
    agnesi.debian.org: Maria Teresa Agnesi (October 17, 1720 - January 19, 1795)
+   agricola.debian.org: Alexander Agricola (1445 or 1446 - August 15, 1506)
    albeniz.debian.org: Isaac Manuel Francisco Albéniz i Pascual (May 29, 1860 - May 18, 1909)
+   allegri.debian.org: Gregorio Allegri (1582 - 7 February 1652)
    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)
@@@ -20,6 -22,7 +22,7 @@@
    klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11, 2000)
    lafayette.debian.org: Eugenie Lafayette
    lebrun.debian.org: Francesca Lebrun (March 24, 1756 - May 14, 1791)
+   liszt.debian.org: Franz Liszt (October 22, 1811 - July 31, 1886)
    mahler.debian.org: Gustav Mahler (7 July 1860 - 18 May 1911)
    mayr.debian.org: Johann(es) Simon Mayr (June 14, 1763 - December 2, 1845)
    merkel.debian.org: Gustav (Adolf) Merkel (November 12, 1827 - October 30, 1885)
@@@ -53,6 -56,7 +56,7 @@@
    strauss.debian.org: Johann Baptist Strauß (October 25, 1825 - June 3, 1899)
    tartini.debian.org: Giuseppe Tartini (April 8, 1692 - February 26, 1770)
    unger.debian.org: Caroline Unger (October 28, 1803 - March 23, 1877)
+   valente.debian.org: Vincenzo Valente (February 21, 1855 - September 6, 1921)
    verdi.debian.org: Giuseppe Fortunino Francesco Verdi (October 9 or 10, 1813 - January 27, 1901)
    voltaire.debian.org: François-Marie Arouet (Voltaire) (21 November 1694 - 30 May 1778)
    wagner.debian.org: Wilhelm Richard Wagner (22 May 1813 - 13 February 1883)
@@@ -92,7 -96,6 +96,7 @@@ host_settings
      - rore.debian.org
      - saens.debian.org
      - samosa.debian.org
 +    - senfl.debian.org
      - tartini.debian.org
    buildd:
      - ancina.debian.org