From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 16 Aug 2010 10:29:20 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5f9b6e60800eeff29318662b84404dc0d23283dc;p=mirror%2Fdsa-puppet.git

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:
  slow down some more search spiders
  move all files to explicit new-style module/ paths
  and apache module
  convert exim module to new syntax - why it needs to change, I don't know
  these settings seem to break samhain on wolkenstein - how odd
  ignore bind stuff on geo servers as well
  libdns66 can be ignored as well - pesky sonames
  The geo's no longer have a local geoip set of packages
---

5f9b6e60800eeff29318662b84404dc0d23283dc