/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-05-26 22:21:17 UTC
  • mto: This revision was merged to the branch mainline in revision 591.
  • Revision ID: teddy@recompile.se-20120526222117-2n4oeb3hqyq4rjdh
* mandos: Implement "--socket" option.
  (IPv6_TCPServer.__init__): Take new "socketfd" parameter; use it.
  (MandosServer.__init__): Take new "socketfd" parameter.  Pass it on
                           to IPv6_TCPServer constructor.
  (main): Take new "--socket" option.  Also take "socket" parameter in
          "mandos.conf" configuration file.  If set, pass the value to
          MandosServer constructor.
* mandos-options.xml (socket): Document new "socket" option.
* mandos-conf.xml (OPTIONS): - '' -
* mandos.xml (SYNOPSIS, OPTIONS): Document new "--socket" option.

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 "2018-02-08">
 
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
 
      <year>2016</year>
43
 
      <year>2017</year>
44
 
      <year>2018</year>
45
38
      <holder>Teddy Hogeborn</holder>
46
39
      <holder>Björn Påhlsson</holder>
47
40
    </copyright>
126
119
        <replaceable>TIME</replaceable></option></arg>
127
120
      </group>
128
121
      <sbr/>
129
 
      <group>
130
 
        <arg choice="plain"><option>--force</option></arg>
131
 
        <arg choice="plain"><option>-f</option></arg>
132
 
      </group>
 
122
      <arg><option>--force</option></arg>
133
123
    </cmdsynopsis>
134
124
    <cmdsynopsis>
135
125
      <command>&COMMANDNAME;</command>
155
145
        <arg choice="plain"><option>-n
156
146
        <replaceable>NAME</replaceable></option></arg>
157
147
      </group>
158
 
      <group>
159
 
        <arg choice="plain"><option>--no-ssh</option></arg>
160
 
        <arg choice="plain"><option>-S</option></arg>
161
 
      </group>
162
148
    </cmdsynopsis>
163
149
    <cmdsynopsis>
164
150
      <command>&COMMANDNAME;</command>
241
227
        <replaceable>TYPE</replaceable></option></term>
242
228
        <listitem>
243
229
          <para>
244
 
            Key type.  Default is <quote>RSA</quote>.
 
230
            Key type.  Default is <quote>DSA</quote>.
245
231
          </para>
246
232
        </listitem>
247
233
      </varlistentry>
253
239
        <replaceable>BITS</replaceable></option></term>
254
240
        <listitem>
255
241
          <para>
256
 
            Key length in bits.  Default is 4096.
 
242
            Key length in bits.  Default is 2048.
257
243
          </para>
258
244
        </listitem>
259
245
      </varlistentry>
265
251
        <replaceable>KEYTYPE</replaceable></option></term>
266
252
        <listitem>
267
253
          <para>
268
 
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
 
254
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
269
255
            encryption-only).
270
256
          </para>
271
257
        </listitem>
278
264
        <replaceable>BITS</replaceable></option></term>
279
265
        <listitem>
280
266
          <para>
281
 
            Subkey length in bits.  Default is 4096.
 
267
            Subkey length in bits.  Default is 2048.
282
268
          </para>
283
269
        </listitem>
284
270
      </varlistentry>
302
288
        <replaceable>TEXT</replaceable></option></term>
303
289
        <listitem>
304
290
          <para>
305
 
            Comment field for key.  Default is empty.
 
291
            Comment field for key.  The default value is
 
292
            <quote><literal>Mandos client key</literal></quote>.
306
293
          </para>
307
294
        </listitem>
308
295
      </varlistentry>
360
347
          </para>
361
348
        </listitem>
362
349
      </varlistentry>
363
 
      <varlistentry>
364
 
        <term><option>--no-ssh</option></term>
365
 
        <term><option>-S</option></term>
366
 
        <listitem>
367
 
          <para>
368
 
            When <option>--password</option> or
369
 
            <option>--passfile</option> is given, this option will
370
 
            prevent <command>&COMMANDNAME;</command> from calling
371
 
            <command>ssh-keyscan</command> to get an SSH fingerprint
372
 
            for this host and, if successful, output suitable config
373
 
            options to use this fingerprint as a
374
 
            <option>checker</option> option in the output.  This is
375
 
            otherwise the default behavior.
376
 
          </para>
377
 
        </listitem>
378
 
      </varlistentry>
379
350
    </variablelist>
380
351
  </refsect1>
381
352
  
452
423
    </variablelist>
453
424
  </refsect1>
454
425
  
455
 
  <refsect1 id="bugs">
456
 
    <title>BUGS</title>
457
 
    <xi:include href="bugs.xml"/>
458
 
  </refsect1>
 
426
<!--   <refsect1 id="bugs"> -->
 
427
<!--     <title>BUGS</title> -->
 
428
<!--     <para> -->
 
429
<!--     </para> -->
 
430
<!--   </refsect1> -->
459
431
  
460
432
  <refsect1 id="example">
461
433
    <title>EXAMPLE</title>
531
503
      <citerefentry><refentrytitle>mandos</refentrytitle>
532
504
      <manvolnum>8</manvolnum></citerefentry>,
533
505
      <citerefentry><refentrytitle>mandos-client</refentrytitle>
534
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
535
 
      <citerefentry><refentrytitle>ssh-keyscan</refentrytitle>
536
 
      <manvolnum>1</manvolnum></citerefentry>
 
506
      <manvolnum>8mandos</manvolnum></citerefentry>
537
507
    </para>
538
508
  </refsect1>
539
509