X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=a8cb69cbcf28c2021cfaa9206c6635d6ea65f981;hb=083c0a47ec1c5e0eccedff1756bac931556842ec;hp=e03d1a2e4d94d3d75642b0a33d067d7a970112f2;hpb=d143bdf2b77ab676758474631ccb02127f150320;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index e03d1a2..a8cb69c 100644
--- 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
 }}}
 
@@ -30,6 +30,8 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * on the host, run ud-replicate and check if it worked
 {{{
+    apt-get update &&
+    apt-get install -y --no-install-recommends userdir-ldap &&
     ud-replicate &&
     id weasel
 }}}
@@ -41,7 +43,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,9 +75,9 @@ 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 &&
+  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 start
 }}}