/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos.conf.xml

  • Committer: Teddy Hogeborn
  • Date: 2012-05-26 22:21:17 UTC
  • mto: (237.7.139 trunk)
  • mto: This revision was merged to the branch mainline in revision 301.
  • 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.conf.xml
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2015-04-02">
 
6
<!ENTITY TIMESTAMP "2012-05-26">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
36
36
      <year>2009</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>
121
120
        <term><option>priority<literal> = </literal><replaceable
122
121
        >STRING</replaceable></option></term>
123
122
        <listitem>
124
 
          <xi:include href="mandos-options.xml"
125
 
                      xpointer="priority_compat"/>
 
123
          <xi:include href="mandos-options.xml" xpointer="priority"/>
126
124
        </listitem>
127
125
      </varlistentry>
128
126
      
223
221
interface = eth0
224
222
address = fe80::aede:48ff:fe71:f6f2
225
223
port = 1025
226
 
debug = True
227
 
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA
 
224
debug = true
 
225
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
228
226
servicename = Daena
229
227
use_dbus = False
230
228
use_ipv6 = True