From 50acc3b0315c77b531b644fbdb8c83891844794f Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 30 Oct 2011 20:11:23 +0100
Subject: [PATCH] combine two blocks

---
 input/howto/puppet-setup.mdwn | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index 1e0c662..9ab1ac0 100644
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -15,9 +15,8 @@ adjusted.
         : ::client:: && apt-get update &&
                 apt-get install --no-install-recommends puppet libaugeas-ruby1.8 augeas-lenses &&
                 /etc/init.d/puppet stop &&
-                puppetd -t
-
-        : ::client:: && cd /var/lib/puppet/ssl/certificate_requests &&
+                puppetd -t &&
+                cd /var/lib/puppet/ssl/certificate_requests &&
                 echo sha256sum output: && echo &&
                 sha256sum $(hostname -f).pem &&
                 echo && echo && cd /
-- 
2.20.1