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

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 62d4a4a..bb05c5b 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -85,16 +85,18 @@ 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]]
 
 * edit dedication into in $DSA-PUPPET/modules/debian-org/misc/local.yaml
 
-* Add host to smarthost machines in $DSA-PUPPET/modules/debian-org/misc/local.yaml (if so desired).  Set MX in ud-ldap.
-
 * add to nagios
 
 -- weasel, Wed, 04 Jun 2008 20:52:56 +0200