/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-keygen.xml

  • Committer: Teddy Hogeborn
  • Date: 2012-06-23 00:58:49 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • 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 "2015-07-20">
 
5
<!ENTITY TIMESTAMP "2012-01-01">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
33
33
    <copyright>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
36
 
      <year>2010</year>
37
36
      <year>2011</year>
38
37
      <year>2012</year>
39
 
      <year>2013</year>
40
 
      <year>2014</year>
41
 
      <year>2015</year>
42
38
      <holder>Teddy Hogeborn</holder>
43
39
      <holder>Björn Påhlsson</holder>
44
40
    </copyright>
123
119
        <replaceable>TIME</replaceable></option></arg>
124
120
      </group>
125
121
      <sbr/>
126
 
      <group>
127
 
        <arg choice="plain"><option>--force</option></arg>
128
 
        <arg choice="plain"><option>-f</option></arg>
129
 
      </group>
 
122
      <arg><option>--force</option></arg>
130
123
    </cmdsynopsis>
131
124
    <cmdsynopsis>
132
125
      <command>&COMMANDNAME;</command>
152
145
        <arg choice="plain"><option>-n
153
146
        <replaceable>NAME</replaceable></option></arg>
154
147
      </group>
155
 
      <group>
156
 
        <arg choice="plain"><option>--no-ssh</option></arg>
157
 
        <arg choice="plain"><option>-S</option></arg>
158
 
      </group>
159
148
    </cmdsynopsis>
160
149
    <cmdsynopsis>
161
150
      <command>&COMMANDNAME;</command>
238
227
        <replaceable>TYPE</replaceable></option></term>
239
228
        <listitem>
240
229
          <para>
241
 
            Key type.  Default is <quote>RSA</quote>.
 
230
            Key type.  Default is <quote>DSA</quote>.
242
231
          </para>
243
232
        </listitem>
244
233
      </varlistentry>
250
239
        <replaceable>BITS</replaceable></option></term>
251
240
        <listitem>
252
241
          <para>
253
 
            Key length in bits.  Default is 4096.
 
242
            Key length in bits.  Default is 2048.
254
243
          </para>
255
244
        </listitem>
256
245
      </varlistentry>
262
251
        <replaceable>KEYTYPE</replaceable></option></term>
263
252
        <listitem>
264
253
          <para>
265
 
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
 
254
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
266
255
            encryption-only).
267
256
          </para>
268
257
        </listitem>
275
264
        <replaceable>BITS</replaceable></option></term>
276
265
        <listitem>
277
266
          <para>
278
 
            Subkey length in bits.  Default is 4096.
 
267
            Subkey length in bits.  Default is 2048.
279
268
          </para>
280
269
        </listitem>
281
270
      </varlistentry>
299
288
        <replaceable>TEXT</replaceable></option></term>
300
289
        <listitem>
301
290
          <para>
302
 
            Comment field for key.  Default is empty.
 
291
            Comment field for key.  The default value is
 
292
            <quote><literal>Mandos client key</literal></quote>.
303
293
          </para>
304
294
        </listitem>
305
295
      </varlistentry>
357
347
          </para>
358
348
        </listitem>
359
349
      </varlistentry>
360
 
      <varlistentry>
361
 
        <term><option>--no-ssh</option></term>
362
 
        <term><option>-S</option></term>
363
 
        <listitem>
364
 
          <para>
365
 
            When <option>--password</option> or
366
 
            <option>--passfile</option> is given, this option will
367
 
            prevent <command>&COMMANDNAME;</command> from calling
368
 
            <command>ssh-keyscan</command> to get an SSH fingerprint
369
 
            for this host and, if successful, output suitable config
370
 
            options to use this fingerprint as a
371
 
            <option>checker</option> option in the output.  This is
372
 
            otherwise the default behavior.
373
 
          </para>
374
 
        </listitem>
375
 
      </varlistentry>
376
350
    </variablelist>
377
351
  </refsect1>
378
352
  
529
503
      <citerefentry><refentrytitle>mandos</refentrytitle>
530
504
      <manvolnum>8</manvolnum></citerefentry>,
531
505
      <citerefentry><refentrytitle>mandos-client</refentrytitle>
532
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
533
 
      <citerefentry><refentrytitle>ssh-keyscan</refentrytitle>
534
 
      <manvolnum>1</manvolnum></citerefentry>
 
506
      <manvolnum>8mandos</manvolnum></citerefentry>
535
507
    </para>
536
508
  </refsect1>
537
509