/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-ctl.xml

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 23:08:17 UTC
  • mto: (237.12.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 290.
  • 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-ctl.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-ctl">
5
 
<!ENTITY TIMESTAMP "2010-09-26">
 
5
<!ENTITY TIMESTAMP "2011-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@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>2010</year>
 
35
      <year>2011</year>
35
36
      <holder>Teddy Hogeborn</holder>
36
37
      <holder>Björn Påhlsson</holder>
37
38
    </copyright>
94
95
      </group>
95
96
      <sbr/>
96
97
      <group>
 
98
        <arg choice="plain"><option>--extended-timeout
 
99
        <replaceable>TIME</replaceable></option></arg>
 
100
      </group>
 
101
      <sbr/>
 
102
      <group>
97
103
        <arg choice="plain"><option>--interval
98
104
        <replaceable>TIME</replaceable></option></arg>
99
105
        <arg choice="plain"><option>-i
317
323
          </para>
318
324
        </listitem>
319
325
      </varlistentry>
 
326
 
 
327
      <varlistentry>
 
328
        <term><option>--extended-timeout
 
329
        <replaceable>TIME</replaceable></option></term>
 
330
        <listitem>
 
331
          <para>
 
332
            Set the <varname>extended_timeout</varname> option of the
 
333
            specified client(s); see <citerefentry><refentrytitle
 
334
            >mandos-clients.conf</refentrytitle><manvolnum
 
335
            >5</manvolnum></citerefentry>.
 
336
          </para>
 
337
        </listitem>
 
338
      </varlistentry>
320
339
      
321
340
      <varlistentry>
322
341
        <term><option>--interval
553
572
  <refsect1 id="see_also">
554
573
    <title>SEE ALSO</title>
555
574
    <para>
 
575
      <citerefentry><refentrytitle>intro</refentrytitle>
 
576
      <manvolnum>8mandos</manvolnum></citerefentry>,
556
577
      <citerefentry><refentrytitle>mandos</refentrytitle>
557
578
      <manvolnum>8</manvolnum></citerefentry>,
558
579
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>