/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-clients.conf.xml

* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
                                to "_" in D-Bus object paths.
  (MandosServer.handle_ipc): Bug fix: Send only address string to
                             D-Bus signal, not whole tuple.

* mandos-ctl: New options "--approve-by-default", "--deny-by-default",
              "--approval-delay", and "--approval-duration".
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new options.

* mandos-monitor (MandosClientWidget.update): Fix spelling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos-clients.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/clients.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2012-01-01">
 
6
<!ENTITY TIMESTAMP "2010-09-25">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
20
20
        <firstname>Björn</firstname>
21
21
        <surname>Påhlsson</surname>
22
22
        <address>
23
 
          <email>belorn@recompile.se</email>
 
23
          <email>belorn@fukt.bsnet.se</email>
24
24
        </address>
25
25
      </author>
26
26
      <author>
27
27
        <firstname>Teddy</firstname>
28
28
        <surname>Hogeborn</surname>
29
29
        <address>
30
 
          <email>teddy@recompile.se</email>
 
30
          <email>teddy@fukt.bsnet.se</email>
31
31
        </address>
32
32
      </author>
33
33
    </authorgroup>
34
34
    <copyright>
35
35
      <year>2008</year>
36
36
      <year>2009</year>
37
 
      <year>2010</year>
38
 
      <year>2011</year>
39
 
      <year>2012</year>
40
37
      <holder>Teddy Hogeborn</holder>
41
38
      <holder>Björn Påhlsson</holder>
42
39
    </copyright>
66
63
      ><refentrytitle>mandos</refentrytitle>
67
64
      <manvolnum>8</manvolnum></citerefentry>, read by it at startup.
68
65
      The file needs to list all clients that should be able to use
69
 
      the service.  The settings in this file can be overridden by
70
 
      runtime changes to the server, which it saves across restarts.
71
 
      (See the section called <quote>PERSISTENT STATE</quote> in
72
 
      <citerefentry><refentrytitle>mandos</refentrytitle><manvolnum
73
 
      >8</manvolnum></citerefentry>.)  However, any <emphasis
74
 
      >changes</emphasis> to this file (including adding and removing
75
 
      clients) will, at startup, override changes done during runtime.
 
66
      the service.  All clients listed will be regarded as enabled,
 
67
      even if a client was disabled in a previous run of the server.
76
68
    </para>
77
69
    <para>
78
70
      The format starts with a <literal>[<replaceable>section
188
180
      </varlistentry>
189
181
      
190
182
      <varlistentry>
191
 
        <term><option>extended_timeout<literal> = </literal><replaceable
192
 
        >TIME</replaceable></option></term>
193
 
        <listitem>
194
 
          <para>
195
 
            This option is <emphasis>optional</emphasis>.
196
 
          </para>
197
 
          <para>
198
 
            Extended timeout is an added timeout that is given once
199
 
            after a password has been sent successfully to a client.
200
 
            The timeout is by default longer than the normal timeout,
201
 
            and is used for handling the extra long downtime while a
202
 
            machine is booting up.  Time to take into consideration
203
 
            when changing this value is file system checks and quota
204
 
            checks.  The default value is 15 minutes.
205
 
          </para>
206
 
          <para>
207
 
            The format of <replaceable>TIME</replaceable> is the same
208
 
            as for <varname>timeout</varname> below.
209
 
          </para>
210
 
        </listitem>
211
 
      </varlistentry>
212
 
      
213
 
      <varlistentry>
214
183
        <term><option>fingerprint<literal> = </literal
215
184
        ><replaceable>HEXSTRING</replaceable></option></term>
216
185
        <listitem>
258
227
            will wait for a checker to complete until the below
259
228
            <quote><varname>timeout</varname></quote> occurs, at which
260
229
            time the client will be disabled, and any running checker
261
 
            killed.  The default interval is 2 minutes.
 
230
            killed.  The default interval is 5 minutes.
262
231
          </para>
263
232
          <para>
264
233
            The format of <replaceable>TIME</replaceable> is the same
328
297
            This option is <emphasis>optional</emphasis>.
329
298
          </para>
330
299
          <para>
331
 
            The timeout is how long the server will wait, after a
332
 
            successful checker run, until a client is disabled and not
333
 
            allowed to get the data this server holds.  By default
334
 
            Mandos will use 5 minutes.  See also the
335
 
            <option>extended_timeout</option> option.
 
300
            The timeout is how long the server will wait (for either a
 
301
            successful checker run or a client receiving its secret)
 
302
            until a client is disabled and not allowed to get the data
 
303
            this server holds.  By default Mandos will use 1 hour.
336
304
          </para>
337
305
          <para>
338
306
            The <replaceable>TIME</replaceable> is specified as a
350
318
        </listitem>
351
319
      </varlistentry>
352
320
      
353
 
      <varlistentry>
354
 
        <term><option>enabled<literal> = </literal>{ <literal
355
 
        >1</literal> | <literal>yes</literal> | <literal>true</literal
356
 
        > | <literal >on</literal> | <literal>0</literal> | <literal
357
 
        >no</literal> | <literal>false</literal> | <literal
358
 
        >off</literal> }</option></term>
359
 
        <listitem>
360
 
          <para>
361
 
            Whether this client should be enabled by default.  The
362
 
            default is <quote>true</quote>.
363
 
          </para>
364
 
        </listitem>
365
 
      </varlistentry>
366
 
      
367
321
    </variablelist>
368
322
  </refsect1>
369
323
  
402
356
        <quote><literal>%%(<replaceable>foo</replaceable>)s</literal
403
357
        ></quote> will be replaced by the value of the attribute
404
358
        <varname>foo</varname> of the internal
405
 
        <quote><classname>Client</classname></quote> object in the
406
 
        Mandos server.  The currently allowed values for
407
 
        <replaceable>foo</replaceable> are:
408
 
        <quote><literal>approval_delay</literal></quote>,
409
 
        <quote><literal>approval_duration</literal></quote>,
410
 
        <quote><literal>created</literal></quote>,
411
 
        <quote><literal>enabled</literal></quote>,
412
 
        <quote><literal>fingerprint</literal></quote>,
413
 
        <quote><literal>host</literal></quote>,
414
 
        <quote><literal>interval</literal></quote>,
415
 
        <quote><literal>last_approval_request</literal></quote>,
416
 
        <quote><literal>last_checked_ok</literal></quote>,
417
 
        <quote><literal>last_enabled</literal></quote>,
418
 
        <quote><literal>name</literal></quote>,
419
 
        <quote><literal>timeout</literal></quote>, and, if using
420
 
        D-Bus, <quote><literal>dbus_object_path</literal></quote>.
421
 
        See the source code for details.  <emphasis role="strong"
422
 
        >Currently, <emphasis>none</emphasis> of these attributes
423
 
        except <quote><literal>host</literal></quote> are guaranteed
424
 
        to be valid in future versions.</emphasis> Therefore, please
425
 
        let the authors know of any attributes that are useful so they
426
 
        may be preserved to any new versions of this software.
 
359
        <quote><classname>Client</classname></quote> object.  See the
 
360
        source code for details, and let the authors know of any
 
361
        attributes that are useful so they may be preserved to any new
 
362
        versions of this software.
427
363
      </para>
428
364
      <para>
429
365
        Note that this means that, in order to include an actual
464
400
    <informalexample>
465
401
      <programlisting>
466
402
[DEFAULT]
467
 
timeout = 5m
468
 
interval = 2m
 
403
timeout = 1h
 
404
interval = 5m
469
405
checker = fping -q -- %%(host)s
470
406
 
471
407
# Client "foo"
504
440
  <refsect1 id="see_also">
505
441
    <title>SEE ALSO</title>
506
442
    <para>
507
 
      <citerefentry><refentrytitle>intro</refentrytitle>
508
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
509
443
      <citerefentry><refentrytitle>mandos-keygen</refentrytitle>
510
444
      <manvolnum>8</manvolnum></citerefentry>,
511
445
      <citerefentry><refentrytitle>mandos.conf</refentrytitle>