/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-22 00:16:20 UTC
  • mfrom: (24.1.57 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080822001620-vxpn1evy0t0kyvj0
* clients.conf ([DEFAULT]/checker): Update to new default value.

* mandos (Client.start_checker): Bug fix: OSError, not
                                 subprocess.OSError.
  (main): Use "fping -q -- %(host)s" instead of "fping -q --
          %%(host)s" as default value for "checker".  Always redirect
          stdin to be from /dev/null, even if in debug mode.

* mandos-clients.conf.xml (DESCRIPTION): Improved wording and refer to
                                         the EXPANSION section.
  (OPTIONS): Added synopsis and improved wording for "checker",
             "fingerprint", and "secret".  Refer to the RUNTIME
             EXPANSION section for the "checker" option.
  (EXAMPLE): Update to new default value for "checker".

* mandos-keygen (trap): Split lines and add "set +e".

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">
8
8
<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
9
9
  <refentryinfo>
10
10
    <title>&COMMANDNAME;</title>
11
 
    <!-- NWalsh’s docbook scripts use this to generate the footer: -->
 
11
    <!-- NWalsh's docbook scripts use this to generate the footer: -->
12
12
    <productname>&COMMANDNAME;</productname>
13
13
    <productnumber>&VERSION;</productnumber>
14
14
    <authorgroup>
29
29
    </authorgroup>
30
30
    <copyright>
31
31
      <year>2008</year>
32
 
      <holder>Teddy Hogeborn</holder>
33
 
      <holder>Björn Påhlsson</holder>
 
32
      <holder>Teddy Hogeborn &amp; Björn Påhlsson</holder>
34
33
    </copyright>
35
34
    <legalnotice>
36
35
      <para>
86
85
        <replaceable>bits</replaceable></arg>
87
86
      </group>
88
87
      <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
88
        <arg choice="plain"><option>--name</option>
98
89
        <replaceable>NAME</replaceable></arg>
99
90
      </group>
128
119
        <replaceable>bits</replaceable></arg>
129
120
      </group>
130
121
      <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
122
        <arg choice="plain"><option>-n</option>
140
123
        <replaceable>NAME</replaceable></arg>
141
124
      </group>
158
141
    <cmdsynopsis>
159
142
      <command>&COMMANDNAME;</command>
160
143
      <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>
 
144
        <arg choice='plain'><option>-h</option></arg>
 
145
        <arg choice='plain'><option>--help</option></arg>
 
146
      </group>
 
147
    </cmdsynopsis>
 
148
    <cmdsynopsis>
 
149
      <command>&COMMANDNAME;</command>
 
150
      <group choice="req">
 
151
        <arg choice='plain'><option>-v</option></arg>
 
152
        <arg choice='plain'><option>--version</option></arg>
185
153
      </group>
186
154
    </cmdsynopsis>
187
155
  </refsynopsisdiv>
197
165
      initrd image, but this, like most things, can be changed with
198
166
      command line options.
199
167
    </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
168
  </refsect1>
207
169
  
208
170
  <refsect1 id="purpose">
235
197
        <replaceable>directory</replaceable></literal></term>
236
198
        <listitem>
237
199
          <para>
238
 
            Target directory for key files.  Default is
239
 
            <filename>/etc/mandos</filename>.
 
200
            Target directory for key files.
240
201
          </para>
241
202
        </listitem>
242
203
      </varlistentry>
246
207
        <replaceable>type</replaceable></literal></term>
247
208
        <listitem>
248
209
          <para>
249
 
            Key type.  Default is <quote>DSA</quote>.
 
210
            Key type.  Default is DSA.
250
211
          </para>
251
212
        </listitem>
252
213
      </varlistentry>
262
223
      </varlistentry>
263
224
 
264
225
      <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.
281
 
          </para>
282
 
        </listitem>
283
 
      </varlistentry>
284
 
 
285
 
      <varlistentry>
286
226
        <term><literal>-e</literal>, <literal>--email</literal>
287
227
        <replaceable>address</replaceable></term>
288
228
        <listitem>
298
238
        <listitem>
299
239
          <para>
300
240
            Comment field for key.  The default value is
301
 
            <quote><literal>Mandos client key</literal></quote>.
 
241
            "<literal>Mandos client key</literal>".
302
242
          </para>
303
243
        </listitem>
304
244
      </varlistentry>
323
263
          </para>
324
264
        </listitem>
325
265
      </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
266
    </variablelist>
345
267
  </refsect1>
346
268
 
348
270
    <title>OVERVIEW</title>
349
271
    <xi:include href="overview.xml"/>
350
272
    <para>
351
 
      This program is a small utility to generate new OpenPGP keys for
 
273
      This program is a small program to generate new OpenPGP keys for
352
274
      new Mandos clients.
353
275
    </para>
354
276
  </refsect1>
449
371
  <refsect1 id="security">
450
372
    <title>SECURITY</title>
451
373
    <para>
452
 
      The <option>--type</option>, <option>--length</option>,
453
 
      <option>--subtype</option>, and <option>--sublength</option>
 
374
      The <option>--type</option> and <option>--length</option>
454
375
      options can be used to create keys of insufficient security.  If
455
376
      in doubt, leave them to the default values.
456
377
    </para>