2:04 p.m.
en-US/Books/PuppetWorkshop/Course.xml | 60 +++++++++++++++++++++++++++++-----
1 file changed, 52 insertions(+), 8 deletions(-)
New commits:
commit c0c53ec7e6eac2d8d2d135a2a333e82a674bf656
Merge: 4ce0ad4... f2da6a4...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Oct 5 21:04:03 2008 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/courses
commit 4ce0ad4ceda0cdb83f6229e10c8c1506c354a372
Merge: b36c924... 848e9f0...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Oct 5 20:58:07 2008 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/courses
commit b36c924d1b67d824ebe767cbc641a8d1ae454445
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Oct 5 20:57:59 2008 +0200
Updates
diff --git a/en-US/Books/PuppetWorkshop/Course.xml
b/en-US/Books/PuppetWorkshop/Course.xml
index 5010acc..a4ec5b3 100644
--- a/en-US/Books/PuppetWorkshop/Course.xml
+++ b/en-US/Books/PuppetWorkshop/Course.xml
@@ -767,7 +767,41 @@ debug: Calling fileserver.describe</screen>
</itemizedlist>
</para>
<para>
- The configuration file for puppet and puppetmaster is
<filename>/etc/puppet/puppet.conf</filename>. It is a file in INI-like format
with sections, keys and values.
+ The configuration file for puppet and puppetmaster is
<filename>/etc/puppet/puppet.conf</filename>. It is a file in INI-like format
with sections, keys and values. There's 4 sections of interest,
+ <itemizedlist>
+ <listitem>
+ <formalpara>
+ <title>[main]</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title>[puppetca]</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title>[puppetd]</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+ </listitem>
+ <listitem>
+ <formalpara>
+ <title>[puppetmasterd]</title>
+ <para>
+ para
+ </para>
+ </formalpara>
+ </listitem>
+ </itemizedlist>
</para>
<formalpara>
<title>First run relevant settings</title>
@@ -841,17 +875,17 @@ debug: Calling fileserver.describe</screen>
</listitem>
<listitem>
<para>
- Whether or not to use autosigning of
certificates, using
- <screen>[puppetca]
- autosign = <replaceable>false</replaceable></screen>
- The default is to
<emphasis>not</emphasis> use autosigning.
+ Another setting to check is whether or not this
puppetmaster is going to be the Certificate Authority <screen>[puppetmasterd]
+ ca = <replaceable>true</replaceable></screen>
+ The default is often set to
<code>true</code>.
</para>
</listitem>
<listitem>
<para>
- Another setting to check is whether or not this
puppetmaster is going to be the Certificate Authority <screen>[puppetmasterd]
- ca = <replaceable>true</replaceable></screen>
- The default is often set to
<code>true</code>.
+ Whether or not to use autosigning of
certificates, using
+ <screen>[puppetca]
+ autosign = <replaceable>false</replaceable></screen>
+ The default is to
<emphasis>not</emphasis> use autosigning. Only applicable if
<code>puppetca</code> is set to <code>true</code>.
</para>
</listitem>
</itemizedlist>
@@ -867,6 +901,9 @@ debug: Calling fileserver.describe</screen>
<screen>[puppetmasterd]
environments =
<replaceable>development,testing,production</replaceable></screen>
</para>
+ <para>
+ <emphasis>See also</emphasis>:
<xref linkend="PuppetWorkshop-HowToUsePuppet-Environments" />
+ </para>
</listitem>
<listitem>
<para>
@@ -960,6 +997,13 @@ debug: Calling fileserver.describe</screen>
</para>
</section>
+ <section id="PuppetWorkshop-HowToUsePuppet-Environments">
+ <title>Environments</title>
+ <para>
+ paragraph
+ </para>
+ </section>
+
</chapter>
<chapter id="PuppetWorkshop-OtherThingsToDoWithPuppet">