From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 17 May 2013 22:09:52 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=8f404a0dfc3344399a7933cabb3768ef5a47f985

Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  Move cert stuff to the puppet setup file
  Add IPv6 address for draghi too
  Drop nsswitch stuff, done by puppet now
  Use service foo rather than calling init scripts directly
  Do not ask for confirmation here
  Enable pluginsync at first run
  Update GNU/kFreeBSD package information
  the part about symlinks is really not needed
  the part about symlinks is really not needed
  puppet agent -t
---

8f404a0dfc3344399a7933cabb3768ef5a47f985