/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: 2017-09-03 09:00:31 UTC
  • Revision ID: teddy@recompile.se-20170903090031-zhxw13lca97zuysr
Plymouth plugin bug fix: Actually try the old PID file location

* plugins.d/plymouth.c (get_pid): Try both plymouth_pid and
  plymouth_old_pid, not just plymouth_pid twice.

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 "2017-02-23">
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>
 
42
      <year>2016</year>
 
43
      <year>2017</year>
38
44
      <holder>Teddy Hogeborn</holder>
39
45
      <holder>Björn Påhlsson</holder>
40
46
    </copyright>
99
105
      <sbr/>
100
106
      <arg><option>--statedir
101
107
      <replaceable>DIRECTORY</replaceable></option></arg>
 
108
      <sbr/>
 
109
      <arg><option>--socket
 
110
      <replaceable>FD</replaceable></option></arg>
 
111
      <sbr/>
 
112
      <arg><option>--foreground</option></arg>
 
113
      <sbr/>
 
114
      <arg><option>--no-zeroconf</option></arg>
102
115
    </cmdsynopsis>
103
116
    <cmdsynopsis>
104
117
      <command>&COMMANDNAME;</command>
285
298
        <term><option>--no-restore</option></term>
286
299
        <listitem>
287
300
          <xi:include href="mandos-options.xml" xpointer="restore"/>
 
301
          <para>
 
302
            See also <xref linkend="persistent_state"/>.
 
303
          </para>
288
304
        </listitem>
289
305
      </varlistentry>
290
306
      
295
311
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
296
312
        </listitem>
297
313
      </varlistentry>
 
314
      
 
315
      <varlistentry>
 
316
        <term><option>--socket
 
317
        <replaceable>FD</replaceable></option></term>
 
318
        <listitem>
 
319
          <xi:include href="mandos-options.xml" xpointer="socket"/>
 
320
        </listitem>
 
321
      </varlistentry>
 
322
      
 
323
      <varlistentry>
 
324
        <term><option>--foreground</option></term>
 
325
        <listitem>
 
326
          <xi:include href="mandos-options.xml"
 
327
                      xpointer="foreground"/>
 
328
        </listitem>
 
329
      </varlistentry>
 
330
      
 
331
      <varlistentry>
 
332
        <term><option>--no-zeroconf</option></term>
 
333
        <listitem>
 
334
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
 
335
        </listitem>
 
336
      </varlistentry>
 
337
      
298
338
    </variablelist>
299
339
  </refsect1>
300
340
  
377
417
      extended timeout, checker program, and interval between checks
378
418
      can be configured both globally and per client; see
379
419
      <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.
 
420
      <manvolnum>5</manvolnum></citerefentry>.
383
421
    </para>
384
422
  </refsect1>
385
423
  
413
451
    </para>
414
452
  </refsect1>
415
453
  
 
454
  <refsect1 id="persistent_state">
 
455
    <title>PERSISTENT STATE</title>
 
456
    <para>
 
457
      Client settings, initially read from
 
458
      <filename>clients.conf</filename>, are persistent across
 
459
      restarts, and run-time changes will override settings in
 
460
      <filename>clients.conf</filename>.  However, if a setting is
 
461
      <emphasis>changed</emphasis> (or a client added, or removed) in
 
462
      <filename>clients.conf</filename>, this will take precedence.
 
463
    </para>
 
464
  </refsect1>
 
465
  
416
466
  <refsect1 id="dbus_interface">
417
467
    <title>D-BUS INTERFACE</title>
418
468
    <para>
480
530
        </listitem>
481
531
      </varlistentry>
482
532
      <varlistentry>
483
 
        <term><filename>/var/run/mandos.pid</filename></term>
 
533
        <term><filename>/run/mandos.pid</filename></term>
484
534
        <listitem>
485
535
          <para>
486
536
            The file containing the process id of the
487
537
            <command>&COMMANDNAME;</command> process started last.
 
538
            <emphasis >Note:</emphasis> If the <filename
 
539
            class="directory">/run</filename> directory does not
 
540
            exist, <filename>/var/run/mandos.pid</filename> will be
 
541
            used instead.
488
542
          </para>
489
543
        </listitem>
490
544
      </varlistentry>
491
545
      <varlistentry>
492
 
        <term><filename class="devicefile">/dev/log</filename></term>
493
 
      </varlistentry>
494
 
      <varlistentry>
495
546
        <term><filename
496
547
        class="directory">/var/lib/mandos</filename></term>
497
548
        <listitem>
503
554
        </listitem>
504
555
      </varlistentry>
505
556
      <varlistentry>
506
 
        <term><filename>/dev/log</filename></term>
 
557
        <term><filename class="devicefile">/dev/log</filename></term>
507
558
        <listitem>
508
559
          <para>
509
560
            The Unix domain socket to where local syslog messages are
535
586
      There is no fine-grained control over logging and debug output.
536
587
    </para>
537
588
    <para>
538
 
      Debug mode is conflated with running in the foreground.
539
 
    </para>
540
 
    <para>
541
589
      This server does not check the expire time of clients’ OpenPGP
542
590
      keys.
543
591
    </para>
 
592
    <xi:include href="bugs.xml"/>
544
593
  </refsect1>
545
594
  
546
595
  <refsect1 id="example">
659
708
      </varlistentry>
660
709
      <varlistentry>
661
710
        <term>
662
 
          <ulink url="http://www.gnu.org/software/gnutls/"
663
 
          >GnuTLS</ulink>
 
711
          <ulink url="https://gnutls.org/">GnuTLS</ulink>
664
712
        </term>
665
713
      <listitem>
666
714
        <para>
704
752
      </varlistentry>
705
753
      <varlistentry>
706
754
        <term>
707
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
708
 
          Protocol Version 1.1</citetitle>
 
755
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
756
          Protocol Version 1.2</citetitle>
709
757
        </term>
710
758
      <listitem>
711
759
        <para>
712
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
760
          TLS 1.2 is the protocol implemented by GnuTLS.
713
761
        </para>
714
762
      </listitem>
715
763
      </varlistentry>
725
773
      </varlistentry>
726
774
      <varlistentry>
727
775
        <term>
728
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
729
 
          Security</citetitle>
 
776
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
777
          Security (TLS) Authentication</citetitle>
730
778
        </term>
731
779
      <listitem>
732
780
        <para>