X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fpuppet-setup.mdwn;h=136ff31caa4ccd17e998939c6346ccc7e687a1ce;hb=0aa7997c0cc9c4df13418cca9e2eb23333152b7f;hp=64341887f8c9a0ec6ec9069f07d8665eb12ca884;hpb=1db786dc02c13edf6b297380f001580247e378cd;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index 6434188..136ff31 100644
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -10,12 +10,12 @@ 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 &&
                 service puppet stop &&
-                (puppet agent -t || true ) &&
+                (puppet agent --no-daemonize --onetime || true ) &&
                 cd /var/lib/puppet/ssl/certificate_requests &&
                 echo sha256sum output: && echo &&
                 sha256sum $me.pem &&
@@ -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 &&
@@ -44,7 +44,8 @@ on handel, paste the sha256output::
                 echo 'EOF' &&
                 cd / &&
                 echo 'puppet agent --enable' &&
-                echo 'puppet agent -t --pluginsync'
+                echo 'puppet agent --no-daemonize --onetime --pluginsync' &&
+                echo 'puppet agent --no-daemonize --onetime --pluginsync'
 
 and execute this on the client.
 
@@ -55,13 +56,13 @@ although the config files should remain identical before and after.
 
 Try this once if you're nervous:
 
-        : ::client:: && puppet agent -t --pluginsync --noop
+        : ::client:: && puppet agent --no-daemonize --onetime --pluginsync --noop
 
 It will tell you what would have changed without actually doing it.
 
 Then run (this will change the configs in /etc):
 
-        : ::client:: && puppet agent -t --pluginsync
+        : ::client:: && puppet agent --no-daemonize --onetime --pluginsync
 
 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