/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: 2016-03-13 00:37:02 UTC
  • Revision ID: teddy@recompile.se-20160313003702-dulwtwt8ilpojra9
Server: Fix bug where it did not exit timely on signals

Use GLib.unix_signal_add() instead of signal.signal() to catch
signals; this will allow GLib to do its internal magic with signal
file descriptors.  (GLib does not handle signals properly otherwise.)
The function unix_signal_add() requires GLib 2.30 or later, which was
not required by PyGobject until version 3.7.1, so depend on this.

* INSTALL (Mandos Server): Document dependency on PyGObject 3.7.1
* mandos (main): Use GLib.unix_signal_add instead of signal.signal.
* init.d-mandos (do_stop): Remove workaround.
* mandos.service ([Service]): - '' -

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 "2019-02-09">
 
6
<!ENTITY TIMESTAMP "2016-03-05">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
41
41
      <year>2014</year>
42
42
      <year>2015</year>
43
43
      <year>2016</year>
44
 
      <year>2017</year>
45
 
      <year>2018</year>
46
44
      <holder>Teddy Hogeborn</holder>
47
45
      <holder>Björn Påhlsson</holder>
48
46
    </copyright>
232
230
          <para>
233
231
            This option sets the OpenPGP fingerprint that identifies
234
232
            the public key that clients authenticate themselves with
235
 
            through TLS.  The string needs to be in hexadecimal form,
236
 
            but spaces or upper/lower case are not significant.
237
 
          </para>
238
 
        </listitem>
239
 
      </varlistentry>
240
 
      
241
 
      <varlistentry>
242
 
        <term><option>key_id<literal> = </literal
243
 
        ><replaceable>HEXSTRING</replaceable></option></term>
244
 
        <listitem>
245
 
          <para>
246
 
            This option is <emphasis>optional</emphasis>.
247
 
          </para>
248
 
          <para>
249
 
            This option sets the certificate key ID that identifies
250
 
            the public key that clients authenticate themselves with
251
 
            through TLS.  The string needs to be in hexadecimal form,
 
233
            through TLS.  The string needs to be in hexidecimal form,
252
234
            but spaces or upper/lower case are not significant.
253
235
          </para>
254
236
        </listitem>
330
312
          <para>
331
313
            If present, this option must be set to a string of
332
314
            base64-encoded binary data.  It will be decoded and sent
333
 
            to the client matching the above <option>key_id</option>
334
 
            or <option>fingerprint</option>.  This should, of course,
335
 
            be OpenPGP encrypted data, decryptable only by the client.
 
315
            to the client matching the above
 
316
            <option>fingerprint</option>.  This should, of course, be
 
317
            OpenPGP encrypted data, decryptable only by the client.
336
318
            The program <citerefentry><refentrytitle><command
337
319
            >mandos-keygen</command></refentrytitle><manvolnum
338
320
            >8</manvolnum></citerefentry> can, using its
433
415
        <quote><literal>created</literal></quote>,
434
416
        <quote><literal>enabled</literal></quote>,
435
417
        <quote><literal>expires</literal></quote>,
436
 
        <quote><literal>key_id</literal></quote>,
437
418
        <quote><literal>fingerprint</literal></quote>,
438
419
        <quote><literal>host</literal></quote>,
439
420
        <quote><literal>interval</literal></quote>,
496
477
 
497
478
# Client "foo"
498
479
[foo]
499
 
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
500
480
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
501
481
secret =
502
482
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
519
499
 
520
500
# Client "bar"
521
501
[bar]
522
 
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
523
502
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
524
503
secfile = /etc/mandos/bar-secret
525
504
timeout = PT15M