X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=3cf0178cffcd3af93d314fb3170c1033917686c6;hb=0aa7997c0cc9c4df13418cca9e2eb23333152b7f;hp=4bfedd5209ffcc2690ca98cecde482484857ec42;hpb=0899cab0bd2bdaccb2a7ec084ab540b5b69cba9c;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 4bfedd5..3cf0178 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -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
 }}}
@@ -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
 }}}
 
@@ -75,7 +76,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
   apt-get install -y samhain &&
   ( 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
 }}}