/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: 2013-10-24 20:21:45 UTC
  • Revision ID: teddy@recompile.se-20131024202145-456a9y6x910a2vhb
* debian/control (Build-Depends): Changed debhelper version to (>= 9)
                                  to match debian/compat.
* mandos-options.xml (priority): Changed back to normal priority.
  (priority_compat): New option; for the server which needs to a
                     priority string compatible with old keys.
* mandos-conf.xml (OPTIONS/priority): Include "priority_compat".
* mandos.xml (OPTIONS/priority): - '' -

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 "2016-03-05">
 
5
<!ENTITY TIMESTAMP "2013-10-23">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
39
39
      <year>2013</year>
40
 
      <year>2014</year>
41
 
      <year>2015</year>
42
 
      <year>2016</year>
43
40
      <holder>Teddy Hogeborn</holder>
44
41
      <holder>Björn Påhlsson</holder>
45
42
    </copyright>
109
106
      <replaceable>FD</replaceable></option></arg>
110
107
      <sbr/>
111
108
      <arg><option>--foreground</option></arg>
112
 
      <sbr/>
113
 
      <arg><option>--no-zeroconf</option></arg>
114
109
    </cmdsynopsis>
115
110
    <cmdsynopsis>
116
111
      <command>&COMMANDNAME;</command>
239
234
        <term><option>--priority <replaceable>
240
235
        PRIORITY</replaceable></option></term>
241
236
        <listitem>
242
 
          <xi:include href="mandos-options.xml" xpointer="priority"/>
 
237
          <xi:include href="mandos-options.xml"
 
238
                      xpointer="priority_compat"/>
243
239
        </listitem>
244
240
      </varlistentry>
245
241
      
327
323
        </listitem>
328
324
      </varlistentry>
329
325
      
330
 
      <varlistentry>
331
 
        <term><option>--no-zeroconf</option></term>
332
 
        <listitem>
333
 
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
334
 
        </listitem>
335
 
      </varlistentry>
336
 
      
337
326
    </variablelist>
338
327
  </refsect1>
339
328
  
534
523
          <para>
535
524
            The file containing the process id of the
536
525
            <command>&COMMANDNAME;</command> process started last.
537
 
            <emphasis >Note:</emphasis> If the <filename
538
 
            class="directory">/run</filename> directory does not
539
 
            exist, <filename>/var/run/mandos.pid</filename> will be
540
 
            used instead.
541
526
          </para>
542
527
        </listitem>
543
528
      </varlistentry>
544
529
      <varlistentry>
 
530
        <term><filename class="devicefile">/dev/log</filename></term>
 
531
      </varlistentry>
 
532
      <varlistentry>
545
533
        <term><filename
546
534
        class="directory">/var/lib/mandos</filename></term>
547
535
        <listitem>
553
541
        </listitem>
554
542
      </varlistentry>
555
543
      <varlistentry>
556
 
        <term><filename class="devicefile">/dev/log</filename></term>
 
544
        <term><filename>/dev/log</filename></term>
557
545
        <listitem>
558
546
          <para>
559
547
            The Unix domain socket to where local syslog messages are
588
576
      This server does not check the expire time of clients’ OpenPGP
589
577
      keys.
590
578
    </para>
591
 
    <xi:include href="bugs.xml"/>
592
579
  </refsect1>
593
580
  
594
581
  <refsect1 id="example">
707
694
      </varlistentry>
708
695
      <varlistentry>
709
696
        <term>
710
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
697
          <ulink url="http://www.gnu.org/software/gnutls/"
 
698
          >GnuTLS</ulink>
711
699
        </term>
712
700
      <listitem>
713
701
        <para>
751
739
      </varlistentry>
752
740
      <varlistentry>
753
741
        <term>
754
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
755
 
          Protocol Version 1.2</citetitle>
 
742
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
743
          Protocol Version 1.1</citetitle>
756
744
        </term>
757
745
      <listitem>
758
746
        <para>
759
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
747
          TLS 1.1 is the protocol implemented by GnuTLS.
760
748
        </para>
761
749
      </listitem>
762
750
      </varlistentry>
772
760
      </varlistentry>
773
761
      <varlistentry>
774
762
        <term>
775
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
776
 
          Security (TLS) Authentication</citetitle>
 
763
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
764
          Security</citetitle>
777
765
        </term>
778
766
      <listitem>
779
767
        <para>