/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: 2013-10-26 19:05:21 UTC
  • Revision ID: teddy@recompile.se-20131026190521-giagilisbyciox2h
Fall back to /var/run for pidfile if /run is not a directory.

This is for old (possibly non-Debian) systems which have not migrated
from /var/run to /run yet.

* init.d-mandos (PIDFILE): Fall back to /var/run/mandos.pid if /run is
                           not a directory.
* mandos (pidfilename): - '' -
* mandos.xml (FILES): Document fallback to /var/run/mandos.pid if /run
                      is not a directory.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

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 "2011-08-08">
 
5
<!ENTITY TIMESTAMP "2013-10-22">
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@fukt.bsnet.se</email>
 
22
          <email>belorn@recompile.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@fukt.bsnet.se</email>
 
29
          <email>teddy@recompile.se</email>
30
30
        </address>
31
31
      </author>
32
32
    </authorgroup>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
36
36
      <year>2011</year>
 
37
      <year>2012</year>
37
38
      <holder>Teddy Hogeborn</holder>
38
39
      <holder>Björn Påhlsson</holder>
39
40
    </copyright>
214
215
        <listitem>
215
216
          <para>
216
217
            Target directory for key files.  Default is
217
 
            <filename>/etc/mandos</filename>.
 
218
            <filename class="directory">/etc/mandos</filename>.
218
219
          </para>
219
220
        </listitem>
220
221
      </varlistentry>
226
227
        <replaceable>TYPE</replaceable></option></term>
227
228
        <listitem>
228
229
          <para>
229
 
            Key type.  Default is <quote>DSA</quote>.
 
230
            Key type.  Default is <quote>RSA</quote>.
230
231
          </para>
231
232
        </listitem>
232
233
      </varlistentry>
238
239
        <replaceable>BITS</replaceable></option></term>
239
240
        <listitem>
240
241
          <para>
241
 
            Key length in bits.  Default is 2048.
 
242
            Key length in bits.  Default is 4096.
242
243
          </para>
243
244
        </listitem>
244
245
      </varlistentry>
250
251
        <replaceable>KEYTYPE</replaceable></option></term>
251
252
        <listitem>
252
253
          <para>
253
 
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
 
254
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
254
255
            encryption-only).
255
256
          </para>
256
257
        </listitem>
263
264
        <replaceable>BITS</replaceable></option></term>
264
265
        <listitem>
265
266
          <para>
266
 
            Subkey length in bits.  Default is 2048.
 
267
            Subkey length in bits.  Default is 4096.
267
268
          </para>
268
269
        </listitem>
269
270
      </varlistentry>
287
288
        <replaceable>TEXT</replaceable></option></term>
288
289
        <listitem>
289
290
          <para>
290
 
            Comment field for key.  The default value is
291
 
            <quote><literal>Mandos client key</literal></quote>.
 
291
            Comment field for key.  Default is empty.
292
292
          </para>
293
293
        </listitem>
294
294
      </varlistentry>
411
411
        </listitem>
412
412
      </varlistentry>
413
413
      <varlistentry>
414
 
        <term><filename>/tmp</filename></term>
 
414
        <term><filename class="directory">/tmp</filename></term>
415
415
        <listitem>
416
416
          <para>
417
417
            Temporary files will be written here if
452
452
    </informalexample>
453
453
    <informalexample>
454
454
      <para>
455
 
        Prompt for a password, encrypt it with the key in
456
 
        <filename>/etc/mandos</filename> and output a section suitable
457
 
        for <filename>clients.conf</filename>.
 
455
        Prompt for a password, encrypt it with the key in <filename
 
456
        class="directory">/etc/mandos</filename> and output a section
 
457
        suitable for <filename>clients.conf</filename>.
458
458
      </para>
459
459
      <para>
460
460
        <userinput>&COMMANDNAME; --password</userinput>