X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fpuppet-setup.mdwn;h=e15a7ba1f251550153854784896a05adb7fcd4f2;hb=b77cf64bc3f9989f6b445f36b310278f21329bec;hp=499b01ee723557715d9388f583d40728f3add7d9;hpb=ad7e43fe41783cce28469afcf58ba514afb52abf;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index 499b01e..e15a7ba 100644
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -12,13 +12,13 @@ adjusted.
 
         : __handel__ && puppetd -t --environment=production
 
-        : ::client:: && apt-get update &&
-                apt-get install --no-install-recommends puppet libaugeas-ruby1.8 augeas-lenses &&
+        : ::client:: && me=$(hostname -f) && [ "$me" != "${me%debian.org}" ] && apt-get update &&
+                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 &&
                 echo sha256sum output: && echo &&
-                sha256sum $(hostname -f).pem &&
+                sha256sum $me.pem &&
                 echo && echo && cd /
 
 This will not overwrite anything yet, since handel has not signed the