minor bootstrapping update

[mirror/dsa-wiki.git] / input / howto / new-machine.creole

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.
 {{{
-    : :: 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
 }}}
 
@@ -41,7 +41,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * 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.
@@ -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 &&
-  ( 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 &&