From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 12 May 2013 16:09:36 +0000 (+0200)
Subject: Move cert stuff to the puppet setup file
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=5fd0c69849d3d336139a5a9bbdb66b400d7d7911

Move cert stuff to the puppet setup file
---

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 2b7b78d..62d4a4a 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -57,11 +57,6 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
     apt-get install -y debian.org debian.org-recommended
 }}}
 
-* On handel, make sure the certs exist for the new host
-{{{
-  : :: handel :: : && sudo -u puppet make -C /srv/puppet.debian.org/ca/ install
-}}}
-
 * run puppet a couple times
 {{{
     puppet agent -t; puppet agent -t; puppet agent -t; puppet agent -t
diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index aad6e4e..edb9bae 100644
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -53,14 +53,18 @@ Then run (this will change the configs in /etc):
 
         : ::client:: && puppet agent -t --pluginsync
 
-This run will start puppet after reconfiguring it, so if you are 
-unhappy with what just happened, you'll need to stop it again to do 
+This run will start puppet after reconfiguring it, so if you are
+unhappy with what just happened, you'll need to stop it again to do
 repair.
 
 Double check apt - the puppet setup usually results in duplicate apt
 sources, since we ship a few under sources.list.d.  Remove any unnecessary
 entries from sources.list.
 
+On handel, make sure the certs exist for the new host
+
+  : :: handel :: : && sudo -u puppet make -C /srv/puppet.debian.org/ca/ install
+
 We ship a samhain config file that includes /lib and /usr/lib.  This will
 almost certainly be different than the config file on the machine, so it
 will result in 1000s of files changed.