From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Wed, 5 Mar 2014 10:34:59 +0000 (+0000)
Subject: Merge commit 'bf6ea14e54acbda6bc45df5d1a7039533c6ce475'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6f5ab1b443d5d953aa49989e4bda961ca5cde4a8;hp=-c;p=mirror%2Fdsa-wiki.git

Merge commit 'bf6ea14e54acbda6bc45df5d1a7039533c6ce475'
---

6f5ab1b443d5d953aa49989e4bda961ca5cde4a8
diff --combined input/howto/new-machine.creole
index ec3c8a2,542d1c7..c0ef89c
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@@ -1,4 -1,4 +1,4 @@@
- == setup/integrate a new machine ==
+ = how to add a new machine =
  
  Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup]].  If stuff breaks fix it.
  
@@@ -23,7 -23,7 +23,7 @@@
  * 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
 -    : :: orff :: && sudo -H ud-replicate
 +    : :: denis :: && sudo -H ud-replicate
  }}}
  
  * setup [[puppet|howto/puppet-setup]]  (run the puppet client two or three times until things converge.)