X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fpuppet-setup.mdwn;h=ca88b204f50055b536f2d7309d35896c429dfb26;hb=HEAD;hp=a54bc026b444e453223367f538948b46384cb6f5;hpb=9869545b0adbfd601ebd4de5767c6df2e9e29fa2;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index a54bc02..ca88b20 100644
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -10,10 +10,10 @@ 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__ && puppet agent -t --environment=production
+        : __handel__ && puppet agent --no-daemonize --onetime --environment=production
 
         : ::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 &&
+                apt-get install -y --no-install-recommends puppet ruby-augeas augeas-lenses lsb-release &&
                 service puppet stop &&
                 (puppet agent -t || true ) &&
                 cd /var/lib/puppet/ssl/certificate_requests &&
@@ -34,7 +34,7 @@ on handel, paste the sha256output::
                 cd /var/lib/puppet/ssl/ca/requests &&
                 ( [ -e $filename ] || (echo "$filename does not exist."; exit 1) ) &&
                 echo -e "$sha256  $filename" | sha256sum -c &&
-                puppetca --sign $(basename "$filename" .pem) &&
+                puppet ca sign $(basename "$filename" .pem) &&
                 echo && echo && echo &&
                 echo 'cat > /var/lib/puppet/ssl/certs/ca.pem << EOF ' &&
                 cat /var/lib/puppet/ssl/certs/ca.pem &&
@@ -42,7 +42,10 @@ on handel, paste the sha256output::
                 echo "cat > /var/lib/puppet/ssl/certs/$filename << EOF " &&
                 cat /var/lib/puppet/ssl/ca/signed/$filename &&
                 echo 'EOF' &&
-                cd /
+                cd / &&
+                echo 'puppet agent --enable' &&
+                echo 'puppet agent -t --pluginsync' &&
+                echo 'puppet agent -t --pluginsync'
 
 and execute this on the client.
 
@@ -84,5 +87,3 @@ in the relevant module (call is something like "params.pp").  You can add
 passwords to this file.  To stop git complaining on push, make sure you
 update .gitignore for the new file.  Now you can import this file where
 you need passwords and use them.
-
-# vim:textwidth=72 sw=8 ts=8 et