/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.xml

  • Committer: Teddy Hogeborn
  • Date: 2016-02-28 03:01:43 UTC
  • Revision ID: teddy@recompile.se-20160228030143-i6w90r7wzkvlx9kq
Stop using python-gnutls.  Use GnuTLS 3.3 or later directly.

* INSTALL: Document dependency on GnuTLS 3.3 and remove dependency on
          Python-GnuTLS.

* debian/control (Source: mandos/Build-Depends): Add (>= 3.3.0) to
                                                 "libgnutls28-dev" and
                                                 "gnutls-dev".
  (Source: mandos/Build-Depends-Indep): Remove "python2.7-gnutls".
  (Package: mandos/Depends): Remove "python-gnutls" and
                             "python2.7-gnutls", add "libgnutls28-dev
                             (>= 3.3.0) | libgnutls30 (>= 3.3.0)"
* mandos: Remove imports of "gnutls" and all submodules.
  (GnuTLS, gnutls): New; simulate a "gnutls" module.  Change all
                    callers to match new shorter names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.xml
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "mandos">
5
 
<!ENTITY TIMESTAMP "2011-11-26">
 
5
<!ENTITY TIMESTAMP "2015-12-06">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
35
35
      <year>2009</year>
36
36
      <year>2010</year>
37
37
      <year>2011</year>
 
38
      <year>2012</year>
 
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
38
42
      <holder>Teddy Hogeborn</holder>
39
43
      <holder>Björn Påhlsson</holder>
40
44
    </copyright>
99
103
      <sbr/>
100
104
      <arg><option>--statedir
101
105
      <replaceable>DIRECTORY</replaceable></option></arg>
 
106
      <sbr/>
 
107
      <arg><option>--socket
 
108
      <replaceable>FD</replaceable></option></arg>
 
109
      <sbr/>
 
110
      <arg><option>--foreground</option></arg>
 
111
      <sbr/>
 
112
      <arg><option>--no-zeroconf</option></arg>
102
113
    </cmdsynopsis>
103
114
    <cmdsynopsis>
104
115
      <command>&COMMANDNAME;</command>
285
296
        <term><option>--no-restore</option></term>
286
297
        <listitem>
287
298
          <xi:include href="mandos-options.xml" xpointer="restore"/>
 
299
          <para>
 
300
            See also <xref linkend="persistent_state"/>.
 
301
          </para>
288
302
        </listitem>
289
303
      </varlistentry>
290
304
      
295
309
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
296
310
        </listitem>
297
311
      </varlistentry>
 
312
      
 
313
      <varlistentry>
 
314
        <term><option>--socket
 
315
        <replaceable>FD</replaceable></option></term>
 
316
        <listitem>
 
317
          <xi:include href="mandos-options.xml" xpointer="socket"/>
 
318
        </listitem>
 
319
      </varlistentry>
 
320
      
 
321
      <varlistentry>
 
322
        <term><option>--foreground</option></term>
 
323
        <listitem>
 
324
          <xi:include href="mandos-options.xml"
 
325
                      xpointer="foreground"/>
 
326
        </listitem>
 
327
      </varlistentry>
 
328
      
 
329
      <varlistentry>
 
330
        <term><option>--no-zeroconf</option></term>
 
331
        <listitem>
 
332
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
 
333
        </listitem>
 
334
      </varlistentry>
 
335
      
298
336
    </variablelist>
299
337
  </refsect1>
300
338
  
377
415
      extended timeout, checker program, and interval between checks
378
416
      can be configured both globally and per client; see
379
417
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
380
 
      <manvolnum>5</manvolnum></citerefentry>.  A client successfully
381
 
      receiving its password will also be treated as a successful
382
 
      checker run.
 
418
      <manvolnum>5</manvolnum></citerefentry>.
383
419
    </para>
384
420
  </refsect1>
385
421
  
413
449
    </para>
414
450
  </refsect1>
415
451
  
 
452
  <refsect1 id="persistent_state">
 
453
    <title>PERSISTENT STATE</title>
 
454
    <para>
 
455
      Client settings, initially read from
 
456
      <filename>clients.conf</filename>, are persistent across
 
457
      restarts, and run-time changes will override settings in
 
458
      <filename>clients.conf</filename>.  However, if a setting is
 
459
      <emphasis>changed</emphasis> (or a client added, or removed) in
 
460
      <filename>clients.conf</filename>, this will take precedence.
 
461
    </para>
 
462
  </refsect1>
 
463
  
416
464
  <refsect1 id="dbus_interface">
417
465
    <title>D-BUS INTERFACE</title>
418
466
    <para>
480
528
        </listitem>
481
529
      </varlistentry>
482
530
      <varlistentry>
483
 
        <term><filename>/var/run/mandos.pid</filename></term>
 
531
        <term><filename>/run/mandos.pid</filename></term>
484
532
        <listitem>
485
533
          <para>
486
534
            The file containing the process id of the
487
535
            <command>&COMMANDNAME;</command> process started last.
 
536
            <emphasis >Note:</emphasis> If the <filename
 
537
            class="directory">/run</filename> directory does not
 
538
            exist, <filename>/var/run/mandos.pid</filename> will be
 
539
            used instead.
488
540
          </para>
489
541
        </listitem>
490
542
      </varlistentry>
491
543
      <varlistentry>
492
 
        <term><filename class="devicefile">/dev/log</filename></term>
493
 
      </varlistentry>
494
 
      <varlistentry>
495
544
        <term><filename
496
545
        class="directory">/var/lib/mandos</filename></term>
497
546
        <listitem>
503
552
        </listitem>
504
553
      </varlistentry>
505
554
      <varlistentry>
506
 
        <term><filename>/dev/log</filename></term>
 
555
        <term><filename class="devicefile">/dev/log</filename></term>
507
556
        <listitem>
508
557
          <para>
509
558
            The Unix domain socket to where local syslog messages are
535
584
      There is no fine-grained control over logging and debug output.
536
585
    </para>
537
586
    <para>
538
 
      Debug mode is conflated with running in the foreground.
539
 
    </para>
540
 
    <para>
541
587
      This server does not check the expire time of clients’ OpenPGP
542
588
      keys.
543
589
    </para>
659
705
      </varlistentry>
660
706
      <varlistentry>
661
707
        <term>
662
 
          <ulink url="http://www.gnu.org/software/gnutls/"
663
 
          >GnuTLS</ulink>
 
708
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
664
709
        </term>
665
710
      <listitem>
666
711
        <para>
704
749
      </varlistentry>
705
750
      <varlistentry>
706
751
        <term>
707
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
708
 
          Protocol Version 1.1</citetitle>
 
752
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
753
          Protocol Version 1.2</citetitle>
709
754
        </term>
710
755
      <listitem>
711
756
        <para>
712
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
757
          TLS 1.2 is the protocol implemented by GnuTLS.
713
758
        </para>
714
759
      </listitem>
715
760
      </varlistentry>
725
770
      </varlistentry>
726
771
      <varlistentry>
727
772
        <term>
728
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
729
 
          Security</citetitle>
 
773
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
774
          Security (TLS) Authentication</citetitle>
730
775
        </term>
731
776
      <listitem>
732
777
        <para>