From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 30 May 2013 09:59:54 +0000 (+0200)
Subject: new installs: samhain update
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=f5891520e5ad425db5d880774168f6671e5e4266

new installs: samhain update
---

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]]