X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=66e65f0197de318262fc692b9b664ca08dcbfc36;hb=89fc8d5388355ab1d01f3bdcf2f1deefb6f11850;hp=8264df13a3565bd929d4c8d7ec764803759b7600;hpb=185d09c5758832f61a54f592d8a20f085817e328;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 8264df1..66e65f0 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,7 @@ 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 install -y --no-install-recommends userdir-ldap &&
     ud-replicate &&
     id weasel
 }}}
@@ -41,7 +42,12 @@ 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.
+{{{
+    apt-get update && apt-get dist-upgrade && apt-get clean
 }}}
 
 * try to login using your user and ssh key.  you should get a homedir.
@@ -68,7 +74,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 &&