/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

* mandos (Client.timeout, Client.interval): Changed from being a
                                            property to be a normal
                                            attribute.
  (Client._timeout, Client._interval): Removed.
  (Client._timeout_milliseconds): Changed from being an attribute to
                                  be a method "timeout_milliseconds".
                                  All users changed.
  (Client._interval_milliseconds): Changed from being an attribute to
                                   be method "interval_milliseconds".
                                   All users changed.
  (Client.__init__): Take additional "use_dbus" keyword argument.
                     Only provide D-Bus interface if "use_dbus" is
                     True.
  (Client.use_dbus): New attribute.
  (Client.dbus_object_path): Changed to only be set if "self.use_dbus"
                             is True.
  (Client.enable, Client.disable, Client.checker_callback,
  Client.bump_timeout, Client.start_checker, Client.stop_checker):
  Only emit D-Bus signals if "self.use_dbus".
  (Client.SetChecker, Client.SetHost, Client.Enable): Bug fix: Emit
                                                      D-Bus signals.
  (Client.SetInterval, Client.SetTimeout): Changed to emit D-Bus
                                           signals.

  (main): Remove deprecated "default" keyword argument to "--check"
          option.  Added new "--no-dbus" option.  Added corresponding
          "use_dbus" server configuration option.  Only provide D-Bus
          interface and emit D-Bus signals if "use_dbus".  Pass
          "use_dbus" on to Client constructor.

* mandos-options.xml ([@id="dbus"]): New option.

* mandos.conf (use_dbus): New option.

* mandos.conf.xml (OPTIONS): New option "use_dbus".
  (EXAMPLE): - '' -

* mandos.xml (SYNOPSIS): New option "--no-dbus".
  (D-BUS INTERFACE): New section.

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 "2016-02-28">
 
5
<!ENTITY TIMESTAMP "2008-10-03">
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
 
      <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
35
      <holder>Teddy Hogeborn</holder>
44
36
      <holder>Björn Påhlsson</holder>
45
37
    </copyright>
124
116
        <replaceable>TIME</replaceable></option></arg>
125
117
      </group>
126
118
      <sbr/>
127
 
      <group>
128
 
        <arg choice="plain"><option>--force</option></arg>
129
 
        <arg choice="plain"><option>-f</option></arg>
130
 
      </group>
 
119
      <arg><option>--force</option></arg>
131
120
    </cmdsynopsis>
132
121
    <cmdsynopsis>
133
122
      <command>&COMMANDNAME;</command>
153
142
        <arg choice="plain"><option>-n
154
143
        <replaceable>NAME</replaceable></option></arg>
155
144
      </group>
156
 
      <group>
157
 
        <arg choice="plain"><option>--no-ssh</option></arg>
158
 
        <arg choice="plain"><option>-S</option></arg>
159
 
      </group>
160
145
    </cmdsynopsis>
161
146
    <cmdsynopsis>
162
147
      <command>&COMMANDNAME;</command>
227
212
        <listitem>
228
213
          <para>
229
214
            Target directory for key files.  Default is
230
 
            <filename class="directory">/etc/mandos</filename>.
 
215
            <filename>/etc/mandos</filename>.
231
216
          </para>
232
217
        </listitem>
233
218
      </varlistentry>
239
224
        <replaceable>TYPE</replaceable></option></term>
240
225
        <listitem>
241
226
          <para>
242
 
            Key type.  Default is <quote>RSA</quote>.
 
227
            Key type.  Default is <quote>DSA</quote>.
243
228
          </para>
244
229
        </listitem>
245
230
      </varlistentry>
251
236
        <replaceable>BITS</replaceable></option></term>
252
237
        <listitem>
253
238
          <para>
254
 
            Key length in bits.  Default is 4096.
 
239
            Key length in bits.  Default is 2048.
255
240
          </para>
256
241
        </listitem>
257
242
      </varlistentry>
263
248
        <replaceable>KEYTYPE</replaceable></option></term>
264
249
        <listitem>
265
250
          <para>
266
 
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
 
251
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
267
252
            encryption-only).
268
253
          </para>
269
254
        </listitem>
276
261
        <replaceable>BITS</replaceable></option></term>
277
262
        <listitem>
278
263
          <para>
279
 
            Subkey length in bits.  Default is 4096.
 
264
            Subkey length in bits.  Default is 2048.
280
265
          </para>
281
266
        </listitem>
282
267
      </varlistentry>
300
285
        <replaceable>TEXT</replaceable></option></term>
301
286
        <listitem>
302
287
          <para>
303
 
            Comment field for key.  Default is empty.
 
288
            Comment field for key.  The default value is
 
289
            <quote><literal>Mandos client key</literal></quote>.
304
290
          </para>
305
291
        </listitem>
306
292
      </varlistentry>
358
344
          </para>
359
345
        </listitem>
360
346
      </varlistentry>
361
 
      <varlistentry>
362
 
        <term><option>--no-ssh</option></term>
363
 
        <term><option>-S</option></term>
364
 
        <listitem>
365
 
          <para>
366
 
            When <option>--password</option> or
367
 
            <option>--passfile</option> is given, this option will
368
 
            prevent <command>&COMMANDNAME;</command> from calling
369
 
            <command>ssh-keyscan</command> to get an SSH fingerprint
370
 
            for this host and, if successful, output suitable config
371
 
            options to use this fingerprint as a
372
 
            <option>checker</option> option in the output.  This is
373
 
            otherwise the default behavior.
374
 
          </para>
375
 
        </listitem>
376
 
      </varlistentry>
377
347
    </variablelist>
378
348
  </refsect1>
379
349
  
439
409
        </listitem>
440
410
      </varlistentry>
441
411
      <varlistentry>
442
 
        <term><filename class="directory">/tmp</filename></term>
 
412
        <term><filename>/tmp</filename></term>
443
413
        <listitem>
444
414
          <para>
445
415
            Temporary files will be written here if
480
450
    </informalexample>
481
451
    <informalexample>
482
452
      <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>.
 
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>.
486
456
      </para>
487
457
      <para>
488
458
        <userinput>&COMMANDNAME; --password</userinput>
521
491
  <refsect1 id="see_also">
522
492
    <title>SEE ALSO</title>
523
493
    <para>
524
 
      <citerefentry><refentrytitle>intro</refentrytitle>
525
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
526
494
      <citerefentry><refentrytitle>gpg</refentrytitle>
527
495
      <manvolnum>1</manvolnum></citerefentry>,
528
496
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
530
498
      <citerefentry><refentrytitle>mandos</refentrytitle>
531
499
      <manvolnum>8</manvolnum></citerefentry>,
532
500
      <citerefentry><refentrytitle>mandos-client</refentrytitle>
533
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
534
 
      <citerefentry><refentrytitle>ssh-keyscan</refentrytitle>
535
 
      <manvolnum>1</manvolnum></citerefentry>
 
501
      <manvolnum>8mandos</manvolnum></citerefentry>
536
502
    </para>
537
503
  </refsect1>
538
504