/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-26 22:21:17 UTC
  • mto: This revision was merged to the branch mainline in revision 591.
  • Revision ID: teddy@recompile.se-20120526222117-2n4oeb3hqyq4rjdh
* mandos: Implement "--socket" option.
  (IPv6_TCPServer.__init__): Take new "socketfd" parameter; use it.
  (MandosServer.__init__): Take new "socketfd" parameter.  Pass it on
                           to IPv6_TCPServer constructor.
  (main): Take new "--socket" option.  Also take "socket" parameter in
          "mandos.conf" configuration file.  If set, pass the value to
          MandosServer constructor.
* mandos-options.xml (socket): Document new "socket" option.
* mandos-conf.xml (OPTIONS): - '' -
* mandos.xml (SYNOPSIS, OPTIONS): Document new "--socket" option.

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-01-25">
 
5
<!ENTITY TIMESTAMP "2012-05-26">
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
39
      <holder>Teddy Hogeborn</holder>
41
40
      <holder>Björn Påhlsson</holder>
42
41
    </copyright>
104
103
      <sbr/>
105
104
      <arg><option>--socket
106
105
      <replaceable>FD</replaceable></option></arg>
107
 
      <sbr/>
108
 
      <arg><option>--foreground</option></arg>
109
 
      <sbr/>
110
 
      <arg><option>--no-zeroconf</option></arg>
111
106
    </cmdsynopsis>
112
107
    <cmdsynopsis>
113
108
      <command>&COMMANDNAME;</command>
236
231
        <term><option>--priority <replaceable>
237
232
        PRIORITY</replaceable></option></term>
238
233
        <listitem>
239
 
          <xi:include href="mandos-options.xml"
240
 
                      xpointer="priority_compat"/>
 
234
          <xi:include href="mandos-options.xml" xpointer="priority"/>
241
235
        </listitem>
242
236
      </varlistentry>
243
237
      
317
311
        </listitem>
318
312
      </varlistentry>
319
313
      
320
 
      <varlistentry>
321
 
        <term><option>--foreground</option></term>
322
 
        <listitem>
323
 
          <xi:include href="mandos-options.xml"
324
 
                      xpointer="foreground"/>
325
 
        </listitem>
326
 
      </varlistentry>
327
 
      
328
 
      <varlistentry>
329
 
        <term><option>--no-zeroconf</option></term>
330
 
        <listitem>
331
 
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
332
 
        </listitem>
333
 
      </varlistentry>
334
 
      
335
314
    </variablelist>
336
315
  </refsect1>
337
316
  
527
506
        </listitem>
528
507
      </varlistentry>
529
508
      <varlistentry>
530
 
        <term><filename>/run/mandos.pid</filename></term>
 
509
        <term><filename>/var/run/mandos.pid</filename></term>
531
510
        <listitem>
532
511
          <para>
533
512
            The file containing the process id of the
534
513
            <command>&COMMANDNAME;</command> process started last.
535
 
            <emphasis >Note:</emphasis> If the <filename
536
 
            class="directory">/run</filename> directory does not
537
 
            exist, <filename>/var/run/mandos.pid</filename> will be
538
 
            used instead.
539
514
          </para>
540
515
        </listitem>
541
516
      </varlistentry>
586
561
      There is no fine-grained control over logging and debug output.
587
562
    </para>
588
563
    <para>
 
564
      Debug mode is conflated with running in the foreground.
 
565
    </para>
 
566
    <para>
589
567
      This server does not check the expire time of clients’ OpenPGP
590
568
      keys.
591
569
    </para>
707
685
      </varlistentry>
708
686
      <varlistentry>
709
687
        <term>
710
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
688
          <ulink url="http://www.gnu.org/software/gnutls/"
 
689
          >GnuTLS</ulink>
711
690
        </term>
712
691
      <listitem>
713
692
        <para>
751
730
      </varlistentry>
752
731
      <varlistentry>
753
732
        <term>
754
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
755
 
          Protocol Version 1.2</citetitle>
 
733
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
734
          Protocol Version 1.1</citetitle>
756
735
        </term>
757
736
      <listitem>
758
737
        <para>
759
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
738
          TLS 1.1 is the protocol implemented by GnuTLS.
760
739
        </para>
761
740
      </listitem>
762
741
      </varlistentry>
772
751
      </varlistentry>
773
752
      <varlistentry>
774
753
        <term>
775
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
776
 
          Security (TLS) Authentication</citetitle>
 
754
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
755
          Security</citetitle>
777
756
        </term>
778
757
      <listitem>
779
758
        <para>