/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 at recompile
  • Date: 2019-12-04 23:46:59 UTC
  • Revision ID: teddy@recompile.se-20191204234659-m4u7bxnjrns6d3fc
Simplification of Python 3 compatibility code

Apply previously-made change in mandos and mandos-ctl also to
mandos-monitor.

* mandos-monitor: Set "__metaclass__ = type" globally for Python 2,
  and remove inheriting from "object" in all places possible.

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 "2018-02-08">
 
6
<!ENTITY TIMESTAMP "2019-02-10">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
43
43
      <year>2016</year>
44
44
      <year>2017</year>
45
45
      <year>2018</year>
 
46
      <year>2019</year>
46
47
      <holder>Teddy Hogeborn</holder>
47
48
      <holder>Björn Påhlsson</holder>
48
49
    </copyright>
186
187
            >--</option> %%(host)s</literal></quote>.  Note that
187
188
            <command>mandos-keygen</command>, when generating output
188
189
            to be inserted into this file, normally looks for an SSH
189
 
            server on the Mandos client, and, if it find one, outputs
 
190
            server on the Mandos client, and, if it finds one, outputs
190
191
            a <option>checker</option> option to check for the
191
 
            client’s key fingerprint – this is more secure against
 
192
            client’s SSH key fingerprint – this is more secure against
192
193
            spoofing.
193
194
          </para>
194
195
          <para>
239
240
      </varlistentry>
240
241
      
241
242
      <varlistentry>
 
243
        <term><option>key_id<literal> = </literal
 
244
        ><replaceable>HEXSTRING</replaceable></option></term>
 
245
        <listitem>
 
246
          <para>
 
247
            This option is <emphasis>optional</emphasis>.
 
248
          </para>
 
249
          <para>
 
250
            This option sets the certificate key ID that identifies
 
251
            the public key that clients authenticate themselves with
 
252
            through TLS.  The string needs to be in hexadecimal form,
 
253
            but spaces or upper/lower case are not significant.
 
254
          </para>
 
255
        </listitem>
 
256
      </varlistentry>
 
257
      
 
258
      <varlistentry>
242
259
        <term><option><literal>host = </literal><replaceable
243
260
        >STRING</replaceable></option></term>
244
261
        <listitem>
314
331
          <para>
315
332
            If present, this option must be set to a string of
316
333
            base64-encoded binary data.  It will be decoded and sent
317
 
            to the client matching the above
318
 
            <option>fingerprint</option>.  This should, of course, be
319
 
            OpenPGP encrypted data, decryptable only by the client.
 
334
            to the client matching the above <option>key_id</option>
 
335
            or <option>fingerprint</option>.  This should, of course,
 
336
            be OpenPGP encrypted data, decryptable only by the client.
320
337
            The program <citerefentry><refentrytitle><command
321
338
            >mandos-keygen</command></refentrytitle><manvolnum
322
339
            >8</manvolnum></citerefentry> can, using its
417
434
        <quote><literal>created</literal></quote>,
418
435
        <quote><literal>enabled</literal></quote>,
419
436
        <quote><literal>expires</literal></quote>,
 
437
        <quote><literal>key_id</literal></quote>,
420
438
        <quote><literal>fingerprint</literal></quote>,
421
439
        <quote><literal>host</literal></quote>,
422
440
        <quote><literal>interval</literal></quote>,
479
497
 
480
498
# Client "foo"
481
499
[foo]
 
500
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
482
501
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
483
502
secret =
484
503
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
501
520
 
502
521
# Client "bar"
503
522
[bar]
 
523
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
504
524
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
505
525
secfile = /etc/mandos/bar-secret
506
526
timeout = PT15M