/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: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

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 "2013-10-22">
 
5
<!ENTITY TIMESTAMP "2011-10-03">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
36
36
      <year>2011</year>
37
 
      <year>2012</year>
38
37
      <holder>Teddy Hogeborn</holder>
39
38
      <holder>Björn Påhlsson</holder>
40
39
    </copyright>
215
214
        <listitem>
216
215
          <para>
217
216
            Target directory for key files.  Default is
218
 
            <filename class="directory">/etc/mandos</filename>.
 
217
            <filename>/etc/mandos</filename>.
219
218
          </para>
220
219
        </listitem>
221
220
      </varlistentry>
227
226
        <replaceable>TYPE</replaceable></option></term>
228
227
        <listitem>
229
228
          <para>
230
 
            Key type.  Default is <quote>RSA</quote>.
 
229
            Key type.  Default is <quote>DSA</quote>.
231
230
          </para>
232
231
        </listitem>
233
232
      </varlistentry>
239
238
        <replaceable>BITS</replaceable></option></term>
240
239
        <listitem>
241
240
          <para>
242
 
            Key length in bits.  Default is 4096.
 
241
            Key length in bits.  Default is 2048.
243
242
          </para>
244
243
        </listitem>
245
244
      </varlistentry>
251
250
        <replaceable>KEYTYPE</replaceable></option></term>
252
251
        <listitem>
253
252
          <para>
254
 
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
 
253
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
255
254
            encryption-only).
256
255
          </para>
257
256
        </listitem>
264
263
        <replaceable>BITS</replaceable></option></term>
265
264
        <listitem>
266
265
          <para>
267
 
            Subkey length in bits.  Default is 4096.
 
266
            Subkey length in bits.  Default is 2048.
268
267
          </para>
269
268
        </listitem>
270
269
      </varlistentry>
288
287
        <replaceable>TEXT</replaceable></option></term>
289
288
        <listitem>
290
289
          <para>
291
 
            Comment field for key.  Default is empty.
 
290
            Comment field for key.  The default value is
 
291
            <quote><literal>Mandos client key</literal></quote>.
292
292
          </para>
293
293
        </listitem>
294
294
      </varlistentry>
411
411
        </listitem>
412
412
      </varlistentry>
413
413
      <varlistentry>
414
 
        <term><filename class="directory">/tmp</filename></term>
 
414
        <term><filename>/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 <filename
456
 
        class="directory">/etc/mandos</filename> and output a section
457
 
        suitable for <filename>clients.conf</filename>.
 
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>.
458
458
      </para>
459
459
      <para>
460
460
        <userinput>&COMMANDNAME; --password</userinput>