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 --cc modules/debian-org/misc/local.yaml
Simple merge