X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fpuppet-setup.mdwn;h=f96c5f962246738bfe6d0fdd0374515a2417c071;hb=98fdc9abe34b67c5118c53ec7b01090f92461260;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..f96c5f9 100644
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -10,15 +10,15 @@ Make sure you have set up the IP address for the new machine in ud-ldap.
 After that run puppet on puppetmaster once, so the ferm config get
 adjusted.
 
-        : __handel__ && puppetd -t --environment=production
+        : __handel__ && puppet agent -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 -y --no-install-recommends puppet libaugeas-ruby1.8 augeas-lenses lsb-release &&
                 /etc/init.d/puppet stop &&
-                (puppetd -t || true ) &&
+                (puppet agent -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
@@ -51,7 +51,7 @@ although the config files should remain identical before and after.
 
 Then run (this will change the configs in /etc):
 
-        : ::client:: && puppetd -t
+        : ::client:: && puppet agent -t
 
 This run will start puppet after reconfiguring it, so if you are 
 unhappy with what just happened, you'll need to stop it again to do