/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-28 08:38:47 UTC
  • Revision ID: teddy@recompile.se-20131028083847-cper3srg5o29r2ge
Use architecture libdir.

Instead of always using /usr/lib/mandos, use whatever the architecture
specifies, like /usr/lib/x86_64-linux-gnu/mandos or /usr/lib64/mandos.
Still use /usr/lib/mandos as a fallback.

* Makefile (LIBDIR): New.
 (install-client-nokey, uninstall-client): Use LIBDIR instead of
                                           $(PREFIX)/lib.
* initramfs-tools-hook: Detect correct libdir and copy from there.

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 "2008-10-03">
 
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>
33
33
    <copyright>
34
34
      <year>2008</year>
 
35
      <year>2009</year>
 
36
      <year>2011</year>
 
37
      <year>2012</year>
35
38
      <holder>Teddy Hogeborn</holder>
36
39
      <holder>Björn Påhlsson</holder>
37
40
    </copyright>
212
215
        <listitem>
213
216
          <para>
214
217
            Target directory for key files.  Default is
215
 
            <filename>/etc/mandos</filename>.
 
218
            <filename class="directory">/etc/mandos</filename>.
216
219
          </para>
217
220
        </listitem>
218
221
      </varlistentry>
224
227
        <replaceable>TYPE</replaceable></option></term>
225
228
        <listitem>
226
229
          <para>
227
 
            Key type.  Default is <quote>DSA</quote>.
 
230
            Key type.  Default is <quote>RSA</quote>.
228
231
          </para>
229
232
        </listitem>
230
233
      </varlistentry>
236
239
        <replaceable>BITS</replaceable></option></term>
237
240
        <listitem>
238
241
          <para>
239
 
            Key length in bits.  Default is 2048.
 
242
            Key length in bits.  Default is 4096.
240
243
          </para>
241
244
        </listitem>
242
245
      </varlistentry>
248
251
        <replaceable>KEYTYPE</replaceable></option></term>
249
252
        <listitem>
250
253
          <para>
251
 
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
 
254
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
252
255
            encryption-only).
253
256
          </para>
254
257
        </listitem>
261
264
        <replaceable>BITS</replaceable></option></term>
262
265
        <listitem>
263
266
          <para>
264
 
            Subkey length in bits.  Default is 2048.
 
267
            Subkey length in bits.  Default is 4096.
265
268
          </para>
266
269
        </listitem>
267
270
      </varlistentry>
285
288
        <replaceable>TEXT</replaceable></option></term>
286
289
        <listitem>
287
290
          <para>
288
 
            Comment field for key.  The default value is
289
 
            <quote><literal>Mandos client key</literal></quote>.
 
291
            Comment field for key.  Default is empty.
290
292
          </para>
291
293
        </listitem>
292
294
      </varlistentry>
409
411
        </listitem>
410
412
      </varlistentry>
411
413
      <varlistentry>
412
 
        <term><filename>/tmp</filename></term>
 
414
        <term><filename class="directory">/tmp</filename></term>
413
415
        <listitem>
414
416
          <para>
415
417
            Temporary files will be written here if
450
452
    </informalexample>
451
453
    <informalexample>
452
454
      <para>
453
 
        Prompt for a password, encrypt it with the key in
454
 
        <filename>/etc/mandos</filename> and output a section suitable
455
 
        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>.
456
458
      </para>
457
459
      <para>
458
460
        <userinput>&COMMANDNAME; --password</userinput>
491
493
  <refsect1 id="see_also">
492
494
    <title>SEE ALSO</title>
493
495
    <para>
 
496
      <citerefentry><refentrytitle>intro</refentrytitle>
 
497
      <manvolnum>8mandos</manvolnum></citerefentry>,
494
498
      <citerefentry><refentrytitle>gpg</refentrytitle>
495
499
      <manvolnum>1</manvolnum></citerefentry>,
496
500
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>