X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=e72648d222a227905fe0099def4282f7fb99d2f6;hp=62d4a4a47448c445b1ffb5b49517e92076249ef7;hb=f5891520e5ad425db5d880774168f6671e5e4266;hpb=7d6d7e91ac4b47a8f19e65b542001fc3663b3dee

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 62d4a4a..e72648d 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -85,8 +85,12 @@ 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 samhain
-  puppet agent -t
+  apt-get install -y samhain &&
+  ( puppet agent -t || true ) &&
+  service samhain stop &&
+  rm /var/state/samhain/samhain_file &&
+  samhain --foreground -t init -p none -s none -l none -m none &&
+  service samhain start
 }}}
 
 * if it is a HP Proliant, or has other management fu, read [[howto/ilo-https]]