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/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=83e272296d6de9197df35a610e997082bebb040b

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/
---

83e272296d6de9197df35a610e997082bebb040b
diff --cc input/howto/puppet-setup.mdwn
index 32a51e5,499b01e..1d2ec88
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@@ -13,9 -13,13 +13,13 @@@ 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 -w 5 -t
+                 (puppetd -t || true ) &&
+                 cd /var/lib/puppet/ssl/certificate_requests &&
+                 echo sha256sum output: && echo &&
+                 sha256sum $(hostname -f).pem &&
+                 echo && echo && cd /
  
  This will not overwrite anything yet, since handel has not signed the
  client cert.  Now is the time to abort if you are getting cold feet.