/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

Minor code cleanup; one minor bug fix.

* initramfs-tools-hook: Bug fix: Use the primary group of the first
                        suitable user found, do not look for a
                        group separately.
* mandos: Unconditionally import "struct" and "fcntl".  Use unicode
          strings everywhere possible.
  (Client._datetime_to_milliseconds): New static method.
  (Client.timeout_milliseconds, Client.interval_milliseconds): Use
                                                               above
                                                               method.
  (ClientDBus.CheckedOK,
  ClientDBus.Enable, ClientDBus.StopChecker): Define normally.
  (if_nametoindex): Document non-acceptance of unicode strings.  All
                    callers adjusted.  Do not import "struct" or
                    "fcntl".  Log warning message if if_nametoindex
                    cannot be found using ctypes modules.
  (main): Bug fix: Do not look for user named "nogroup".

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 "2008-09-30">
 
6
<!ENTITY TIMESTAMP "2009-02-15">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
33
33
    </authorgroup>
34
34
    <copyright>
35
35
      <year>2008</year>
 
36
      <year>2009</year>
36
37
      <holder>Teddy Hogeborn</holder>
37
38
      <holder>Björn Påhlsson</holder>
38
39
    </copyright>
169
170
            <varname>PATH</varname> will be searched.  The default
170
171
            value for the checker command is <quote><literal
171
172
            ><command>fping</command> <option>-q</option> <option
172
 
            >--</option> %(host)s</literal></quote>.
 
173
            >--</option> %%(host)s</literal></quote>.
173
174
          </para>
174
175
          <para>
175
176
            In addition to normal start time expansion, this option
240
241
            should <emphasis>not</emphasis> be base64-encoded, but
241
242
            will be sent to clients verbatim.
242
243
          </para>
 
244
          <para>
 
245
            File names of the form <filename>~user/foo/bar</filename>
 
246
            and <filename>$<envar>ENVVAR</envar>/foo/bar</filename>
 
247
            are supported.
 
248
          </para>
243
249
        </listitem>
244
250
      </varlistentry>
245
251
      
251
257
            This option is <emphasis>optional</emphasis>, but highly
252
258
            <emphasis>recommended</emphasis> unless the
253
259
            <option>checker</option> option is modified to a
254
 
            non-standard value without <quote>%(host)s</quote> in it.
 
260
            non-standard value without <quote>%%(host)s</quote> in it.
255
261
          </para>
256
262
          <para>
257
263
            Host name for this client.  This is not used by the server
345
351
[DEFAULT]
346
352
timeout = 1h
347
353
interval = 5m
348
 
checker = fping -q -- %(host)s
 
354
checker = fping -q -- %%(host)s
349
355
 
350
356
# Client "foo"
351
357
[foo]