/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 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-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 "2011-09-24">
 
6
<!ENTITY TIMESTAMP "2011-11-26">
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>
190
190
          </para>
191
191
          <para>
192
192
            Extended timeout is an added timeout that is given once
193
 
            after a password has been sent sucessfully to a client.
 
193
            after a password has been sent successfully to a client.
194
194
            The timeout is by default longer than the normal timeout,
195
195
            and is used for handling the extra long downtime while a
196
196
            machine is booting up.  Time to take into consideration
344
344
        </listitem>
345
345
      </varlistentry>
346
346
      
 
347
      <varlistentry>
 
348
        <term><option>enabled<literal> = </literal>{ <literal
 
349
        >1</literal> | <literal>yes</literal> | <literal>true</literal
 
350
        > | <literal >on</literal> | <literal>0</literal> | <literal
 
351
        >no</literal> | <literal>false</literal> | <literal
 
352
        >off</literal> }</option></term>
 
353
        <listitem>
 
354
          <para>
 
355
            Whether this client should be enabled by default.  The
 
356
            default is <quote>true</quote>.
 
357
          </para>
 
358
        </listitem>
 
359
      </varlistentry>
 
360
      
347
361
    </variablelist>
348
362
  </refsect1>
349
363