/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: 2012-06-23 00:58:49 UTC
  • Revision ID: teddy@recompile.se-20120623005849-02wj82cng433rt2k
* clients.conf: Convert all time intervals to new RFC 3339 syntax.
* mandos: All client options for time intervals now take an RFC 3339
          duration.
  (rfc3339_duration_to_delta): New function.
  (string_to_delta): Try rfc3339_duration_to_delta first.
* mandos-clients.conf.xml (OPTIONS/timeout): Document new format.
  (EXAMPLE): Update to new interval format.
  (SEE ALSO): Reference RFC 3339.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen.xml
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 COMMANDNAME "mandos-keygen">
5
 
<!ENTITY TIMESTAMP "2014-06-22">
 
5
<!ENTITY TIMESTAMP "2012-01-01">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
119
119
        <replaceable>TIME</replaceable></option></arg>
120
120
      </group>
121
121
      <sbr/>
122
 
      <group>
123
 
        <arg choice="plain"><option>--force</option></arg>
124
 
        <arg choice="plain"><option>-f</option></arg>
125
 
      </group>
 
122
      <arg><option>--force</option></arg>
126
123
    </cmdsynopsis>
127
124
    <cmdsynopsis>
128
125
      <command>&COMMANDNAME;</command>
148
145
        <arg choice="plain"><option>-n
149
146
        <replaceable>NAME</replaceable></option></arg>
150
147
      </group>
151
 
      <group>
152
 
        <arg choice="plain"><option>--no-ssh</option></arg>
153
 
        <arg choice="plain"><option>-S</option></arg>
154
 
      </group>
155
148
    </cmdsynopsis>
156
149
    <cmdsynopsis>
157
150
      <command>&COMMANDNAME;</command>
234
227
        <replaceable>TYPE</replaceable></option></term>
235
228
        <listitem>
236
229
          <para>
237
 
            Key type.  Default is <quote>RSA</quote>.
 
230
            Key type.  Default is <quote>DSA</quote>.
238
231
          </para>
239
232
        </listitem>
240
233
      </varlistentry>
246
239
        <replaceable>BITS</replaceable></option></term>
247
240
        <listitem>
248
241
          <para>
249
 
            Key length in bits.  Default is 4096.
 
242
            Key length in bits.  Default is 2048.
250
243
          </para>
251
244
        </listitem>
252
245
      </varlistentry>
258
251
        <replaceable>KEYTYPE</replaceable></option></term>
259
252
        <listitem>
260
253
          <para>
261
 
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
 
254
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
262
255
            encryption-only).
263
256
          </para>
264
257
        </listitem>
271
264
        <replaceable>BITS</replaceable></option></term>
272
265
        <listitem>
273
266
          <para>
274
 
            Subkey length in bits.  Default is 4096.
 
267
            Subkey length in bits.  Default is 2048.
275
268
          </para>
276
269
        </listitem>
277
270
      </varlistentry>
295
288
        <replaceable>TEXT</replaceable></option></term>
296
289
        <listitem>
297
290
          <para>
298
 
            Comment field for key.  Default is empty.
 
291
            Comment field for key.  The default value is
 
292
            <quote><literal>Mandos client key</literal></quote>.
299
293
          </para>
300
294
        </listitem>
301
295
      </varlistentry>
353
347
          </para>
354
348
        </listitem>
355
349
      </varlistentry>
356
 
      <varlistentry>
357
 
        <term><option>--no-ssh</option></term>
358
 
        <term><option>-S</option></term>
359
 
        <listitem>
360
 
          <para>
361
 
            When <option>--password</option> or
362
 
            <option>--passfile</option> is given, this option will
363
 
            prevent <command>&COMMANDNAME;</command> from calling
364
 
            <command>ssh-keyscan</command> to get an SSH fingerprint
365
 
            for this host and, if successful, output suitable config
366
 
            options to use this fingerprint as a
367
 
            <option>checker</option> option in the output.  This is
368
 
            otherwise the default behavior.
369
 
          </para>
370
 
        </listitem>
371
 
      </varlistentry>
372
350
    </variablelist>
373
351
  </refsect1>
374
352
  
525
503
      <citerefentry><refentrytitle>mandos</refentrytitle>
526
504
      <manvolnum>8</manvolnum></citerefentry>,
527
505
      <citerefentry><refentrytitle>mandos-client</refentrytitle>
528
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
529
 
      <citerefentry><refentrytitle>ssh-keyscan</refentrytitle>
530
 
      <manvolnum>1</manvolnum></citerefentry>
 
506
      <manvolnum>8mandos</manvolnum></citerefentry>
531
507
    </para>
532
508
  </refsect1>
533
509