From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 27 Nov 2011 13:43:56 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=83e272296d6de9197df35a610e997082bebb040b;hp=b105d901b241b1b1063ae91cec9b6ceca753d216;p=mirror%2Fdsa-wiki.git

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

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  per guest target dir for installs
  first puppetd -t will fail
  combine two blocks
  add -y to apt-get install
  when adding a new host, run puppet on draghi to update the firewall
  Update add-guest instructions
  do not wait for cert
  Update puppet howto:  automate checksum checking, make domain independent
  Copy etc/apt/preferences only if it exists
  s/ext3/ext4/
---

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index 499b01e..1d2ec88 100644
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -13,7 +13,7 @@ adjusted.
         : __handel__ && puppetd -t --environment=production
 
         : ::client:: && apt-get update &&
-                apt-get install --no-install-recommends puppet libaugeas-ruby1.8 augeas-lenses &&
+                apt-get install --no-install-recommends puppet libaugeas-ruby1.8 augeas-lenses lsb-release &&
                 /etc/init.d/puppet stop &&
                 (puppetd -t || true ) &&
                 cd /var/lib/puppet/ssl/certificate_requests &&