Use -t with puppet agent again instead of onetime --pluginsync. -t also implies...

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 675c708..36edc83 100644 (file)
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -22,7 +22,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * run generate, or wait until cron runs it for you.  Update DNS.
 {{{
 
 * run generate, or wait until cron runs it for you.  Update DNS.
 {{{

-    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate && sudo -H puppet agent --no-daemonize --onetime
+    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate && sudo -H puppet agent -t

     : :: denis :: && sudo -H ud-replicate
 }}}
 
     : :: denis :: && sudo -H ud-replicate
 }}}
 


@@ -43,7 +43,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * run puppet a couple times
 {{{
 
 * run puppet a couple times
 {{{

-    puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime
+    puppet agent -t; puppet agent -t; puppet agent -t

 }}}
 
 * install security updates etc.
 }}}
 
 * install security updates etc.


@@ -68,7 +68,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 * install samhain and get puppet to configure it
 {{{
   apt-get install -y samhain &&
 * install samhain and get puppet to configure it
 {{{
   apt-get install -y samhain &&

-  ( puppet agent --no-daemonize --onetime || true ) &&
+  ( puppet agent -t || true ) &&

   service samhain stop &&
   rm -f /var/state/samhain/samhain_file /var/lib/samhain/samhain_file &&
   samhain --foreground -t init -p none -s none -l none -m none &&
   service samhain stop &&
   rm -f /var/state/samhain/samhain_file /var/lib/samhain/samhain_file &&
   samhain --foreground -t init -p none -s none -l none -m none &&

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index 243d759..ca88b20 100644 (file)
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -15,7 +15,7 @@ adjusted.
         : ::client:: && me=$(hostname -f) && [ "$me" != "${me%debian.org}" ] && apt-get update &&
                 apt-get install -y --no-install-recommends puppet ruby-augeas augeas-lenses lsb-release &&
                 service puppet stop &&
         : ::client:: && me=$(hostname -f) && [ "$me" != "${me%debian.org}" ] && apt-get update &&
                 apt-get install -y --no-install-recommends puppet ruby-augeas augeas-lenses lsb-release &&
                 service puppet stop &&

-                (puppet agent --no-daemonize --onetime || true ) &&
+                (puppet agent -t || true ) &&

                 cd /var/lib/puppet/ssl/certificate_requests &&
                 echo sha256sum output: && echo &&
                 sha256sum $me.pem &&
                 cd /var/lib/puppet/ssl/certificate_requests &&
                 echo sha256sum output: && echo &&
                 sha256sum $me.pem &&


@@ -44,8 +44,8 @@ on handel, paste the sha256output::
                 echo 'EOF' &&
                 cd / &&
                 echo 'puppet agent --enable' &&
                 echo 'EOF' &&
                 cd / &&
                 echo 'puppet agent --enable' &&

-                echo 'puppet agent --no-daemonize --onetime --pluginsync' &&
-                echo 'puppet agent --no-daemonize --onetime --pluginsync'
+                echo 'puppet agent -t --pluginsync' &&
+                echo 'puppet agent -t --pluginsync'

 
 and execute this on the client.
 
 
 and execute this on the client.
 


@@ -56,13 +56,13 @@ although the config files should remain identical before and after.
 
 Try this once if you're nervous:
 
 
 Try this once if you're nervous:
 

-        : ::client:: && puppet agent --no-daemonize --onetime --pluginsync --noop
+        : ::client:: && puppet agent -t --pluginsync --noop

 
 It will tell you what would have changed without actually doing it.
 
 Then run (this will change the configs in /etc):
 
 
 It will tell you what would have changed without actually doing it.
 
 Then run (this will change the configs in /etc):
 

-        : ::client:: && puppet agent --no-daemonize --onetime --pluginsync
+        : ::client:: && puppet agent -t --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
 
 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