X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fpuppet-setup.mdwn;h=ca88b204f50055b536f2d7309d35896c429dfb26;hb=4748598a49ca95a8569fb7638db087e00821ddeb;hp=6a155d69717c1e7a57eb2f2cab8581b304cb440f;hpb=10872c48997281bcea11d44fbaaed6c49e1ff21f;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index 6a155d6..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 &&
@@ -43,6 +43,8 @@ on handel, paste the sha256output::
                 cat /var/lib/puppet/ssl/ca/signed/$filename &&
                 echo 'EOF' &&
                 cd / &&
+                echo 'puppet agent --enable' &&
+                echo 'puppet agent -t --pluginsync' &&
                 echo 'puppet agent -t --pluginsync'
 
 and execute this on the client.