/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-options.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-options.xml
49
49
  <para id="priority">
50
50
    GnuTLS priority string for the <acronym>TLS</acronym> handshake.
51
51
    The default is <quote><literal
52
 
    >SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP</literal></quote>.
53
 
    See <citerefentry><refentrytitle
54
 
    >gnutls_priority_init</refentrytitle>
 
52
    >SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP</literal></quote>.  See
 
53
    <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle>
55
54
    <manvolnum>3</manvolnum></citerefentry> for the syntax.
56
55
    <emphasis>Warning</emphasis>: changing this may make the
57
56
    <acronym>TLS</acronym> handshake fail, making server-client
104
103
    default, the server will create a new network socket.
105
104
  </para>
106
105
  
107
 
  <para id="foreground">
108
 
    This option will make the server run in the foreground and not
109
 
    write a PID file.  The default is to <emphasis>not</emphasis> run
110
 
    in the foreground, except in <option>debug</option> mode, which
111
 
    implies this option.
112
 
  </para>
113
 
  
114
106
</section>