/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: 2012-05-12 19:29:05 UTC
  • Revision ID: teddy@recompile.se-20120512192905-8icx7a55j0o7o70n
* mandos (Client.runtime_expansions): Add "expires" and (bug fix)
                                      "last_approval_request".
  (main): Don't ignore SIGINT.
* mandos-clients.conf.xml (RUNTIME EXPANSION): Added "expires".

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 "2015-07-20">
 
5
<!ENTITY TIMESTAMP "2012-01-15">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
36
36
      <year>2010</year>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
39
 
      <year>2013</year>
40
 
      <year>2014</year>
41
 
      <year>2015</year>
42
39
      <holder>Teddy Hogeborn</holder>
43
40
      <holder>Björn Påhlsson</holder>
44
41
    </copyright>
103
100
      <sbr/>
104
101
      <arg><option>--statedir
105
102
      <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>
113
103
    </cmdsynopsis>
114
104
    <cmdsynopsis>
115
105
      <command>&COMMANDNAME;</command>
309
299
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
310
300
        </listitem>
311
301
      </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
 
      
336
302
    </variablelist>
337
303
  </refsect1>
338
304
  
528
494
        </listitem>
529
495
      </varlistentry>
530
496
      <varlistentry>
531
 
        <term><filename>/run/mandos.pid</filename></term>
 
497
        <term><filename>/var/run/mandos.pid</filename></term>
532
498
        <listitem>
533
499
          <para>
534
500
            The file containing the process id of the
535
501
            <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.
540
502
          </para>
541
503
        </listitem>
542
504
      </varlistentry>
587
549
      There is no fine-grained control over logging and debug output.
588
550
    </para>
589
551
    <para>
 
552
      Debug mode is conflated with running in the foreground.
 
553
    </para>
 
554
    <para>
590
555
      This server does not check the expire time of clients’ OpenPGP
591
556
      keys.
592
557
    </para>
708
673
      </varlistentry>
709
674
      <varlistentry>
710
675
        <term>
711
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
676
          <ulink url="http://www.gnu.org/software/gnutls/"
 
677
          >GnuTLS</ulink>
712
678
        </term>
713
679
      <listitem>
714
680
        <para>
752
718
      </varlistentry>
753
719
      <varlistentry>
754
720
        <term>
755
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
756
 
          Protocol Version 1.2</citetitle>
 
721
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
722
          Protocol Version 1.1</citetitle>
757
723
        </term>
758
724
      <listitem>
759
725
        <para>
760
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
726
          TLS 1.1 is the protocol implemented by GnuTLS.
761
727
        </para>
762
728
      </listitem>
763
729
      </varlistentry>
773
739
      </varlistentry>
774
740
      <varlistentry>
775
741
        <term>
776
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
777
 
          Security (TLS) Authentication</citetitle>
 
742
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
743
          Security</citetitle>
778
744
        </term>
779
745
      <listitem>
780
746
        <para>