/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

* initramfs-tools-hook: Add missing terminating `" when setting
                        mandos_user and mandos_group.

* mandos.conf.xml (SEE ALSO): Improved grammar.

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 "2017-02-23">
 
5
<!ENTITY TIMESTAMP "2009-01-04">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
19
19
        <firstname>Björn</firstname>
20
20
        <surname>Påhlsson</surname>
21
21
        <address>
22
 
          <email>belorn@recompile.se</email>
 
22
          <email>belorn@fukt.bsnet.se</email>
23
23
        </address>
24
24
      </author>
25
25
      <author>
26
26
        <firstname>Teddy</firstname>
27
27
        <surname>Hogeborn</surname>
28
28
        <address>
29
 
          <email>teddy@recompile.se</email>
 
29
          <email>teddy@fukt.bsnet.se</email>
30
30
        </address>
31
31
      </author>
32
32
    </authorgroup>
33
33
    <copyright>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
36
 
      <year>2010</year>
37
 
      <year>2011</year>
38
 
      <year>2012</year>
39
 
      <year>2013</year>
40
 
      <year>2014</year>
41
 
      <year>2015</year>
42
 
      <year>2016</year>
43
 
      <year>2017</year>
44
36
      <holder>Teddy Hogeborn</holder>
45
37
      <holder>Björn Påhlsson</holder>
46
38
    </copyright>
125
117
        <replaceable>TIME</replaceable></option></arg>
126
118
      </group>
127
119
      <sbr/>
128
 
      <group>
129
 
        <arg choice="plain"><option>--force</option></arg>
130
 
        <arg choice="plain"><option>-f</option></arg>
131
 
      </group>
 
120
      <arg><option>--force</option></arg>
132
121
    </cmdsynopsis>
133
122
    <cmdsynopsis>
134
123
      <command>&COMMANDNAME;</command>
154
143
        <arg choice="plain"><option>-n
155
144
        <replaceable>NAME</replaceable></option></arg>
156
145
      </group>
157
 
      <group>
158
 
        <arg choice="plain"><option>--no-ssh</option></arg>
159
 
        <arg choice="plain"><option>-S</option></arg>
160
 
      </group>
161
146
    </cmdsynopsis>
162
147
    <cmdsynopsis>
163
148
      <command>&COMMANDNAME;</command>
228
213
        <listitem>
229
214
          <para>
230
215
            Target directory for key files.  Default is
231
 
            <filename class="directory">/etc/mandos</filename>.
 
216
            <filename>/etc/mandos</filename>.
232
217
          </para>
233
218
        </listitem>
234
219
      </varlistentry>
240
225
        <replaceable>TYPE</replaceable></option></term>
241
226
        <listitem>
242
227
          <para>
243
 
            Key type.  Default is <quote>RSA</quote>.
 
228
            Key type.  Default is <quote>DSA</quote>.
244
229
          </para>
245
230
        </listitem>
246
231
      </varlistentry>
252
237
        <replaceable>BITS</replaceable></option></term>
253
238
        <listitem>
254
239
          <para>
255
 
            Key length in bits.  Default is 4096.
 
240
            Key length in bits.  Default is 2048.
256
241
          </para>
257
242
        </listitem>
258
243
      </varlistentry>
264
249
        <replaceable>KEYTYPE</replaceable></option></term>
265
250
        <listitem>
266
251
          <para>
267
 
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
 
252
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
268
253
            encryption-only).
269
254
          </para>
270
255
        </listitem>
277
262
        <replaceable>BITS</replaceable></option></term>
278
263
        <listitem>
279
264
          <para>
280
 
            Subkey length in bits.  Default is 4096.
 
265
            Subkey length in bits.  Default is 2048.
281
266
          </para>
282
267
        </listitem>
283
268
      </varlistentry>
301
286
        <replaceable>TEXT</replaceable></option></term>
302
287
        <listitem>
303
288
          <para>
304
 
            Comment field for key.  Default is empty.
 
289
            Comment field for key.  The default value is
 
290
            <quote><literal>Mandos client key</literal></quote>.
305
291
          </para>
306
292
        </listitem>
307
293
      </varlistentry>
359
345
          </para>
360
346
        </listitem>
361
347
      </varlistentry>
362
 
      <varlistentry>
363
 
        <term><option>--no-ssh</option></term>
364
 
        <term><option>-S</option></term>
365
 
        <listitem>
366
 
          <para>
367
 
            When <option>--password</option> or
368
 
            <option>--passfile</option> is given, this option will
369
 
            prevent <command>&COMMANDNAME;</command> from calling
370
 
            <command>ssh-keyscan</command> to get an SSH fingerprint
371
 
            for this host and, if successful, output suitable config
372
 
            options to use this fingerprint as a
373
 
            <option>checker</option> option in the output.  This is
374
 
            otherwise the default behavior.
375
 
          </para>
376
 
        </listitem>
377
 
      </varlistentry>
378
348
    </variablelist>
379
349
  </refsect1>
380
350
  
440
410
        </listitem>
441
411
      </varlistentry>
442
412
      <varlistentry>
443
 
        <term><filename class="directory">/tmp</filename></term>
 
413
        <term><filename>/tmp</filename></term>
444
414
        <listitem>
445
415
          <para>
446
416
            Temporary files will be written here if
451
421
    </variablelist>
452
422
  </refsect1>
453
423
  
454
 
  <refsect1 id="bugs">
455
 
    <title>BUGS</title>
456
 
    <xi:include href="bugs.xml"/>
457
 
  </refsect1>
 
424
<!--   <refsect1 id="bugs"> -->
 
425
<!--     <title>BUGS</title> -->
 
426
<!--     <para> -->
 
427
<!--     </para> -->
 
428
<!--   </refsect1> -->
458
429
  
459
430
  <refsect1 id="example">
460
431
    <title>EXAMPLE</title>
480
451
    </informalexample>
481
452
    <informalexample>
482
453
      <para>
483
 
        Prompt for a password, encrypt it with the key in <filename
484
 
        class="directory">/etc/mandos</filename> and output a section
485
 
        suitable for <filename>clients.conf</filename>.
 
454
        Prompt for a password, encrypt it with the key in
 
455
        <filename>/etc/mandos</filename> and output a section suitable
 
456
        for <filename>clients.conf</filename>.
486
457
      </para>
487
458
      <para>
488
459
        <userinput>&COMMANDNAME; --password</userinput>
521
492
  <refsect1 id="see_also">
522
493
    <title>SEE ALSO</title>
523
494
    <para>
524
 
      <citerefentry><refentrytitle>intro</refentrytitle>
525
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
526
495
      <citerefentry><refentrytitle>gpg</refentrytitle>
527
496
      <manvolnum>1</manvolnum></citerefentry>,
528
497
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
530
499
      <citerefentry><refentrytitle>mandos</refentrytitle>
531
500
      <manvolnum>8</manvolnum></citerefentry>,
532
501
      <citerefentry><refentrytitle>mandos-client</refentrytitle>
533
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
534
 
      <citerefentry><refentrytitle>ssh-keyscan</refentrytitle>
535
 
      <manvolnum>1</manvolnum></citerefentry>
 
502
      <manvolnum>8mandos</manvolnum></citerefentry>
536
503
    </para>
537
504
  </refsect1>
538
505