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

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 22:22:20 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126222220-1ubwjpb5ugqnrhec
Directory with persistent state can now be changed with the "statedir"
option.  The state directory /var/lib/mandos now gets created on
installation.  Added documentation about "restore" and "statedir"
options.

* Makefile (USER, GROUP, STATEDIR): New.
  (maintainer-clean): Also remove "statedir".
  (run-server): Replaced "--no-restore" with "--statedir=statedir".
  (statedir): New.
  (install-server): Make $(STATEDIR) directory.
* debian/mandos.dirs (var/lib/mandos): Added.
* debian/mandos.postinst: Fix ownership of /var/lib/mandos.
* mandos: New --statedir option.
  (stored_state_path): Not global anymore.
  (stored_state_file): New global.
* mandos.conf: Fix whitespace.
  (restore, statedir): Added.
* mandos.conf.xml (OPTIONS, EXAMPLE): Added "restore" and "statedir".
  mandos.xml (SYNOPSIS, OPTIONS): Added "--statedir".
  (FILES): Added "/var/lib/mandos".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-clients.conf.xml
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 "2010-09-25">
 
6
<!ENTITY TIMESTAMP "2011-10-10">
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@fukt.bsnet.se</email>
 
23
          <email>belorn@recompile.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@fukt.bsnet.se</email>
 
30
          <email>teddy@recompile.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>
37
39
      <holder>Teddy Hogeborn</holder>
38
40
      <holder>Björn Påhlsson</holder>
39
41
    </copyright>
180
182
      </varlistentry>
181
183
      
182
184
      <varlistentry>
 
185
        <term><option>extended_timeout<literal> = </literal><replaceable
 
186
        >TIME</replaceable></option></term>
 
187
        <listitem>
 
188
          <para>
 
189
            This option is <emphasis>optional</emphasis>.
 
190
          </para>
 
191
          <para>
 
192
            Extended timeout is an added timeout that is given once
 
193
            after a password has been sent successfully to a client.
 
194
            The timeout is by default longer than the normal timeout,
 
195
            and is used for handling the extra long downtime while a
 
196
            machine is booting up.  Time to take into consideration
 
197
            when changing this value is file system checks and quota
 
198
            checks.  The default value is 15 minutes.
 
199
          </para>
 
200
          <para>
 
201
            The format of <replaceable>TIME</replaceable> is the same
 
202
            as for <varname>timeout</varname> below.
 
203
          </para>
 
204
        </listitem>
 
205
      </varlistentry>
 
206
      
 
207
      <varlistentry>
183
208
        <term><option>fingerprint<literal> = </literal
184
209
        ><replaceable>HEXSTRING</replaceable></option></term>
185
210
        <listitem>
227
252
            will wait for a checker to complete until the below
228
253
            <quote><varname>timeout</varname></quote> occurs, at which
229
254
            time the client will be disabled, and any running checker
230
 
            killed.  The default interval is 5 minutes.
 
255
            killed.  The default interval is 2 minutes.
231
256
          </para>
232
257
          <para>
233
258
            The format of <replaceable>TIME</replaceable> is the same
297
322
            This option is <emphasis>optional</emphasis>.
298
323
          </para>
299
324
          <para>
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.
 
325
            The timeout is how long the server will wait, after a
 
326
            successful checker run, until a client is disabled and not
 
327
            allowed to get the data this server holds.  By default
 
328
            Mandos will use 5 minutes.  See also the
 
329
            <option>extended_timeout</option> option.
304
330
          </para>
305
331
          <para>
306
332
            The <replaceable>TIME</replaceable> is specified as a
356
382
        <quote><literal>%%(<replaceable>foo</replaceable>)s</literal
357
383
        ></quote> will be replaced by the value of the attribute
358
384
        <varname>foo</varname> of the internal
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.
 
385
        <quote><classname>Client</classname></quote> object in the
 
386
        Mandos server.  The currently allowed values for
 
387
        <replaceable>foo</replaceable> are:
 
388
        <quote><literal>approval_delay</literal></quote>,
 
389
        <quote><literal>approval_duration</literal></quote>,
 
390
        <quote><literal>created</literal></quote>,
 
391
        <quote><literal>enabled</literal></quote>,
 
392
        <quote><literal>fingerprint</literal></quote>,
 
393
        <quote><literal>host</literal></quote>,
 
394
        <quote><literal>interval</literal></quote>,
 
395
        <quote><literal>last_approval_request</literal></quote>,
 
396
        <quote><literal>last_checked_ok</literal></quote>,
 
397
        <quote><literal>last_enabled</literal></quote>,
 
398
        <quote><literal>name</literal></quote>,
 
399
        <quote><literal>timeout</literal></quote>, and, if using
 
400
        D-Bus, <quote><literal>dbus_object_path</literal></quote>.
 
401
        See the source code for details.  <emphasis role="strong"
 
402
        >Currently, <emphasis>none</emphasis> of these attributes
 
403
        except <quote><literal>host</literal></quote> are guaranteed
 
404
        to be valid in future versions.</emphasis> Therefore, please
 
405
        let the authors know of any attributes that are useful so they
 
406
        may be preserved to any new versions of this software.
363
407
      </para>
364
408
      <para>
365
409
        Note that this means that, in order to include an actual
400
444
    <informalexample>
401
445
      <programlisting>
402
446
[DEFAULT]
403
 
timeout = 1h
404
 
interval = 5m
 
447
timeout = 5m
 
448
interval = 2m
405
449
checker = fping -q -- %%(host)s
406
450
 
407
451
# Client "foo"
440
484
  <refsect1 id="see_also">
441
485
    <title>SEE ALSO</title>
442
486
    <para>
 
487
      <citerefentry><refentrytitle>intro</refentrytitle>
 
488
      <manvolnum>8mandos</manvolnum></citerefentry>,
443
489
      <citerefentry><refentrytitle>mandos-keygen</refentrytitle>
444
490
      <manvolnum>8</manvolnum></citerefentry>,
445
491
      <citerefentry><refentrytitle>mandos.conf</refentrytitle>