/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-keygen.xml

  • Committer: Teddy Hogeborn
  • Date: 2008-08-19 13:25:14 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080819132514-wawrvgmfjovg9poj
* Makefile (DOCBOOKTOMAN): Added "--xinclude".

* mandos-options.xml: New file; moved mandos(8) option descriptions
                      here.

* mandos.conf.xml: Add XInclude namespace.
  (OPTIONS): New separate section with options from old "DESCRIPTION"
             section.  Changed all options to include a synopsis and
             include its paragraph from "mandos-options.xml".
  (FILES): Moved to before "EXAMPLES".
  (BUGS): New section.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).  Unindented
              example text.

* mandos.xml: Removed OVERVIEW entity.  Add XInclude namespace.
  (OPTIONS): Moved all descriptive paragraphs to "mandos-options.xml"
             and just <xi:include/> them from here.
  (OVERVIEW): Changed to do <xi:include/>.

* overview.xml: Added DOCTYPE; reportedly needed for XInclude to work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen.xml
1
 
<?xml version="1.0" encoding="UTF-8"?>
 
1
<?xml version='1.0' encoding='UTF-8'?>
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY VERSION "1.0">
5
5
<!ENTITY COMMANDNAME "mandos-keygen">
 
6
<!ENTITY OVERVIEW SYSTEM "overview.xml">
6
7
]>
7
8
 
8
 
<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
 
9
<refentry>
9
10
  <refentryinfo>
10
11
    <title>&COMMANDNAME;</title>
11
 
    <!-- NWalsh’s docbook scripts use this to generate the footer: -->
 
12
    <!-- NWalsh's docbook scripts use this to generate the footer: -->
12
13
    <productname>&COMMANDNAME;</productname>
13
14
    <productnumber>&VERSION;</productnumber>
14
15
    <authorgroup>
29
30
    </authorgroup>
30
31
    <copyright>
31
32
      <year>2008</year>
32
 
      <holder>Teddy Hogeborn</holder>
33
 
      <holder>Björn Påhlsson</holder>
 
33
      <holder>Teddy Hogeborn &amp; Björn Påhlsson</holder>
34
34
    </copyright>
35
35
    <legalnotice>
36
36
      <para>
86
86
        <replaceable>bits</replaceable></arg>
87
87
      </group>
88
88
      <group choice="opt">
89
 
        <arg choice="plain"><option>--subtype</option>
90
 
        <replaceable>type</replaceable></arg>
91
 
      </group>
92
 
      <group choice="opt">
93
 
        <arg choice="plain"><option>--sublength</option>
94
 
        <replaceable>bits</replaceable></arg>
95
 
      </group>
96
 
      <group choice="opt">
97
89
        <arg choice="plain"><option>--name</option>
98
90
        <replaceable>NAME</replaceable></arg>
99
91
      </group>
128
120
        <replaceable>bits</replaceable></arg>
129
121
      </group>
130
122
      <group choice="opt">
131
 
        <arg choice="plain"><option>-s</option>
132
 
        <replaceable>type</replaceable></arg>
133
 
      </group>
134
 
      <group choice="opt">
135
 
        <arg choice="plain"><option>-L</option>
136
 
        <replaceable>bits</replaceable></arg>
137
 
      </group>
138
 
      <group choice="opt">
139
123
        <arg choice="plain"><option>-n</option>
140
124
        <replaceable>NAME</replaceable></arg>
141
125
      </group>
158
142
    <cmdsynopsis>
159
143
      <command>&COMMANDNAME;</command>
160
144
      <group choice="req">
161
 
        <arg choice="plain"><option>-p</option></arg>
162
 
        <arg choice="plain"><option>--password</option></arg>
163
 
      </group>
164
 
      <group choice="opt">
165
 
        <arg choice="plain"><option>--dir</option>
166
 
        <replaceable>directory</replaceable></arg>
167
 
      </group>
168
 
      <group choice="opt">
169
 
        <arg choice="plain"><option>--name</option>
170
 
        <replaceable>NAME</replaceable></arg>
171
 
      </group>
172
 
    </cmdsynopsis>
173
 
    <cmdsynopsis>
174
 
      <command>&COMMANDNAME;</command>
175
 
      <group choice="req">
176
 
        <arg choice="plain"><option>-h</option></arg>
177
 
        <arg choice="plain"><option>--help</option></arg>
178
 
      </group>
179
 
    </cmdsynopsis>
180
 
    <cmdsynopsis>
181
 
      <command>&COMMANDNAME;</command>
182
 
      <group choice="req">
183
 
        <arg choice="plain"><option>-v</option></arg>
184
 
        <arg choice="plain"><option>--version</option></arg>
 
145
        <arg choice='plain'><option>-h</option></arg>
 
146
        <arg choice='plain'><option>--help</option></arg>
 
147
      </group>
 
148
    </cmdsynopsis>
 
149
    <cmdsynopsis>
 
150
      <command>&COMMANDNAME;</command>
 
151
      <group choice="req">
 
152
        <arg choice='plain'><option>-v</option></arg>
 
153
        <arg choice='plain'><option>--version</option></arg>
185
154
      </group>
186
155
    </cmdsynopsis>
187
156
  </refsynopsisdiv>
197
166
      initrd image, but this, like most things, can be changed with
198
167
      command line options.
199
168
    </para>
200
 
    <para>
201
 
      It can also be used to generate ready-made sections for
202
 
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
203
 
      <manvolnum>5</manvolnum></citerefentry> using the
204
 
      <option>--password</option> option.
205
 
    </para>
206
169
  </refsect1>
207
170
  
208
171
  <refsect1 id="purpose">
235
198
        <replaceable>directory</replaceable></literal></term>
236
199
        <listitem>
237
200
          <para>
238
 
            Target directory for key files.  Default is
239
 
            <filename>/etc/mandos</filename>.
 
201
            Target directory for key files.
240
202
          </para>
241
203
        </listitem>
242
204
      </varlistentry>
246
208
        <replaceable>type</replaceable></literal></term>
247
209
        <listitem>
248
210
          <para>
249
 
            Key type.  Default is <quote>DSA</quote>.
 
211
            Key type.  Default is DSA.
250
212
          </para>
251
213
        </listitem>
252
214
      </varlistentry>
256
218
        <replaceable>bits</replaceable></literal></term>
257
219
        <listitem>
258
220
          <para>
259
 
            Key length in bits.  Default is 2048.
260
 
          </para>
261
 
        </listitem>
262
 
      </varlistentry>
263
 
 
264
 
      <varlistentry>
265
 
        <term><literal>-s</literal>, <literal>--subtype
266
 
        <replaceable>type</replaceable></literal></term>
267
 
        <listitem>
268
 
          <para>
269
 
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
270
 
            encryption-only).
271
 
          </para>
272
 
        </listitem>
273
 
      </varlistentry>
274
 
 
275
 
      <varlistentry>
276
 
        <term><literal>-L</literal>, <literal>--sublength
277
 
        <replaceable>bits</replaceable></literal></term>
278
 
        <listitem>
279
 
          <para>
280
 
            Subkey length in bits.  Default is 2048.
 
221
            Key length in bits.  Default is 1024.
281
222
          </para>
282
223
        </listitem>
283
224
      </varlistentry>
298
239
        <listitem>
299
240
          <para>
300
241
            Comment field for key.  The default value is
301
 
            <quote><literal>Mandos client key</literal></quote>.
 
242
            "<literal>Mandos client key</literal>".
302
243
          </para>
303
244
        </listitem>
304
245
      </varlistentry>
323
264
          </para>
324
265
        </listitem>
325
266
      </varlistentry>
326
 
      <varlistentry>
327
 
        <term><literal>-p</literal>, <literal>--password</literal
328
 
        ></term>
329
 
        <listitem>
330
 
          <para>
331
 
            Prompt for a password and encrypt it with the key already
332
 
            present in either <filename>/etc/mandos</filename> or the
333
 
            directory specified with the <option>--dir</option>
334
 
            option.  Outputs, on standard output, a section suitable
335
 
            for inclusion in <citerefentry><refentrytitle
336
 
            >mandos-clients.conf</refentrytitle><manvolnum
337
 
            >8</manvolnum></citerefentry>.  The host name or the name
338
 
            specified with the <option>--name</option> option is used
339
 
            for the section header.  All other options are ignored,
340
 
            and no keys are created.
341
 
          </para>
342
 
        </listitem>
343
 
      </varlistentry>
344
267
    </variablelist>
345
268
  </refsect1>
346
269
 
347
270
  <refsect1 id="overview">
348
271
    <title>OVERVIEW</title>
349
 
    <xi:include href="overview.xml"/>
 
272
    &OVERVIEW;
350
273
    <para>
351
 
      This program is a small utility to generate new OpenPGP keys for
 
274
      This program is a small program to generate new OpenPGP keys for
352
275
      new Mandos clients.
353
276
    </para>
354
277
  </refsect1>
449
372
  <refsect1 id="security">
450
373
    <title>SECURITY</title>
451
374
    <para>
452
 
      The <option>--type</option>, <option>--length</option>,
453
 
      <option>--subtype</option>, and <option>--sublength</option>
 
375
      The <option>--type</option> and <option>--length</option>
454
376
      options can be used to create keys of insufficient security.  If
455
377
      in doubt, leave them to the default values.
456
378
    </para>
467
389
      <citerefentry><refentrytitle>password-request</refentrytitle>
468
390
      <manvolnum>8mandos</manvolnum></citerefentry>,
469
391
      <citerefentry><refentrytitle>mandos</refentrytitle>
470
 
      <manvolnum>8</manvolnum></citerefentry>,
 
392
      <manvolnum>8</manvolnum></citerefentry>, and
471
393
      <citerefentry><refentrytitle>gpg</refentrytitle>
472
394
      <manvolnum>1</manvolnum></citerefentry>
473
395
    </para>