minor bootstrapping update

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index e03d1a2..4bfedd5 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 puppetd -t
+    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate && sudo -H puppetd --no-daemonize --onetime

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


@@ -41,7 +41,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 -t; puppet agent -t; puppet agent -t; puppet agent -t
+    puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime

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


@@ -73,7 +73,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 -t || true ) &&
+  ( puppet agent --no-daemonize --onetime || true ) &&

   service samhain stop &&
   rm /var/state/samhain/samhain_file &&
   samhain --foreground -t init -p none -s none -l none -m none &&
   service samhain stop &&
   rm /var/state/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 6434188..9fd4eec 100644 (file)
--- 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.
 
 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 &&
 
         : ::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 &&
                 cd /var/lib/puppet/ssl/certificate_requests &&
                 echo sha256sum output: && echo &&
                 sha256sum $me.pem &&


@@ -44,7 +44,8 @@ on handel, paste the sha256output::
                 echo 'EOF' &&
                 cd / &&
                 echo 'puppet agent --enable' &&
                 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.
 
 
 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:
 
 
 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):
 
 
 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
 
 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