X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=3cf0178cffcd3af93d314fb3170c1033917686c6;hb=7218ca8bb78e99ba57f5c387bb7059c12e90f237;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..3cf0178 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.
@@ -53,10 +55,9 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * try to become root using sudo.
 
-* make ca-certificates sane:  (choose to *not* trust new certs, and we only want the spi cert activated)
+* make ca-certificates sane:  (choose to *not* trust new certs)
 {{{
     echo "ca-certificates ca-certificates/trust_new_crts  select no" | debconf-set-selections
-    sed -i -e 's/^[^#!].*/!&/; s#^!spi-inc.org/spi-cacert-2008.crt#spi-inc.org/spi-cacert-2008.crt#' /etc/ca-certificates.conf
     dpkg-reconfigure ca-certificates
 }}}
 
@@ -73,9 +74,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
 }}}