/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: 2012-05-26 22:21:17 UTC
  • mto: This revision was merged to the branch mainline in revision 591.
  • Revision ID: teddy@recompile.se-20120526222117-2n4oeb3hqyq4rjdh
* mandos: Implement "--socket" option.
  (IPv6_TCPServer.__init__): Take new "socketfd" parameter; use it.
  (MandosServer.__init__): Take new "socketfd" parameter.  Pass it on
                           to IPv6_TCPServer constructor.
  (main): Take new "--socket" option.  Also take "socket" parameter in
          "mandos.conf" configuration file.  If set, pass the value to
          MandosServer constructor.
* mandos-options.xml (socket): Document new "socket" option.
* mandos-conf.xml (OPTIONS): - '' -
* mandos.xml (SYNOPSIS, OPTIONS): Document new "--socket" option.

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-10-10">
 
6
<!ENTITY TIMESTAMP "2012-05-12">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
36
36
      <year>2009</year>
37
37
      <year>2010</year>
38
38
      <year>2011</year>
 
39
      <year>2012</year>
39
40
      <holder>Teddy Hogeborn</holder>
40
41
      <holder>Björn Påhlsson</holder>
41
42
    </copyright>
65
66
      ><refentrytitle>mandos</refentrytitle>
66
67
      <manvolnum>8</manvolnum></citerefentry>, read by it at startup.
67
68
      The file needs to list all clients that should be able to use
68
 
      the service.  All clients listed will be regarded as enabled,
69
 
      even if a client was disabled in a previous run of the server.
 
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.
70
76
    </para>
71
77
    <para>
72
78
      The format starts with a <literal>[<replaceable>section
344
350
        </listitem>
345
351
      </varlistentry>
346
352
      
 
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
      
347
367
    </variablelist>
348
368
  </refsect1>
349
369
  
389
409
        <quote><literal>approval_duration</literal></quote>,
390
410
        <quote><literal>created</literal></quote>,
391
411
        <quote><literal>enabled</literal></quote>,
 
412
        <quote><literal>expires</literal></quote>,
392
413
        <quote><literal>fingerprint</literal></quote>,
393
414
        <quote><literal>host</literal></quote>,
394
415
        <quote><literal>interval</literal></quote>,