/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

Merge from Teddy:

Bug fixes: Make D-Bus properties settable again, and handle checkers
for disabled clients correctly.

* mandos (ClientDBus.notifychangeproperty/setter): Bug fix: pass
                                                   variant_level as a
                                                   keyword argument.
  (ClientDBus.Timeout_dbus_property): Bug fix: call function
                                      _timedelta_to_milliseconds in
                                      its new position as a global
                                      function.
  (Client.checked_ok): Bug fix: Handle disabled client.
* mandos-ctl (main): Bug fix: Handle empty strings correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
1
 
<?xml version='1.0' encoding='UTF-8'?>
 
1
<?xml version="1.0" encoding="UTF-8"?>
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
 
<!ENTITY VERSION "1.0">
5
4
<!ENTITY CONFNAME "mandos.conf">
6
5
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
7
 
<!ENTITY TIMESTAMP "2008-08-30">
 
6
<!ENTITY TIMESTAMP "2011-10-03">
 
7
<!ENTITY % common SYSTEM "common.ent">
 
8
%common;
8
9
]>
9
10
 
10
11
<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
12
13
    <title>Mandos Manual</title>
13
14
    <!-- NWalsh’s docbook scripts use this to generate the footer: -->
14
15
    <productname>Mandos</productname>
15
 
    <productnumber>&VERSION;</productnumber>
 
16
    <productnumber>&version;</productnumber>
16
17
    <date>&TIMESTAMP;</date>
17
18
    <authorgroup>
18
19
      <author>
19
20
        <firstname>Björn</firstname>
20
21
        <surname>Påhlsson</surname>
21
22
        <address>
22
 
          <email>belorn@fukt.bsnet.se</email>
 
23
          <email>belorn@recompile.se</email>
23
24
        </address>
24
25
      </author>
25
26
      <author>
26
27
        <firstname>Teddy</firstname>
27
28
        <surname>Hogeborn</surname>
28
29
        <address>
29
 
          <email>teddy@fukt.bsnet.se</email>
 
30
          <email>teddy@recompile.se</email>
30
31
        </address>
31
32
      </author>
32
33
    </authorgroup>
33
34
    <copyright>
34
35
      <year>2008</year>
 
36
      <year>2009</year>
 
37
      <year>2011</year>
35
38
      <holder>Teddy Hogeborn</holder>
36
39
      <holder>Björn Påhlsson</holder>
37
40
    </copyright>
38
 
    <legalnotice>
39
 
      <para>
40
 
        This manual page is free software: you can redistribute it
41
 
        and/or modify it under the terms of the GNU General Public
42
 
        License as published by the Free Software Foundation,
43
 
        either version 3 of the License, or (at your option) any
44
 
        later version.
45
 
      </para>
46
 
 
47
 
      <para>
48
 
        This manual page is distributed in the hope that it will
49
 
        be useful, but WITHOUT ANY WARRANTY; without even the
50
 
        implied warranty of MERCHANTABILITY or FITNESS FOR A
51
 
        PARTICULAR PURPOSE.  See the GNU General Public License
52
 
        for more details.
53
 
      </para>
54
 
 
55
 
      <para>
56
 
        You should have received a copy of the GNU General Public
57
 
        License along with this program; If not, see
58
 
        <ulink url="http://www.gnu.org/licenses/"/>.
59
 
      </para>
60
 
    </legalnotice>
 
41
    <xi:include href="legalnotice.xml"/>
61
42
  </refentryinfo>
62
 
 
 
43
  
63
44
  <refmeta>
64
45
    <refentrytitle>&CONFNAME;</refentrytitle>
65
46
    <manvolnum>5</manvolnum>
71
52
      Configuration file for the Mandos server
72
53
    </refpurpose>
73
54
  </refnamediv>
74
 
 
 
55
  
75
56
  <refsynopsisdiv>
76
57
    <synopsis>&CONFPATH;</synopsis>
77
58
  </refsynopsisdiv>
78
 
 
 
59
  
79
60
  <refsect1 id="description">
80
61
    <title>DESCRIPTION</title>
81
62
    <para>
93
74
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
94
75
      to provide comments.
95
76
    </para>
96
 
 
 
77
    
97
78
  </refsect1>
98
79
  <refsect1>
99
80
    <title>OPTIONS</title>
106
87
          <xi:include href="mandos-options.xml" xpointer="interface"/>
107
88
        </listitem>
108
89
      </varlistentry>
109
 
 
 
90
      
110
91
      <varlistentry>
111
92
        <term><option>address<literal> = </literal><replaceable
112
93
          >ADDRESS</replaceable></option></term>
114
95
          <xi:include href="mandos-options.xml" xpointer="address"/>
115
96
        </listitem>
116
97
      </varlistentry>
117
 
 
 
98
      
118
99
      <varlistentry>
119
100
        <term><option>port<literal> = </literal><replaceable
120
101
        >NUMBER</replaceable></option></term>
122
103
          <xi:include href="mandos-options.xml" xpointer="port"/>
123
104
        </listitem>
124
105
      </varlistentry>
125
 
 
 
106
      
126
107
      <varlistentry>
127
108
        <term><option>debug<literal> = </literal>{ <literal
128
109
          >1</literal> | <literal>yes</literal> | <literal
133
114
          <xi:include href="mandos-options.xml" xpointer="debug"/>
134
115
        </listitem>
135
116
      </varlistentry>
136
 
 
 
117
      
137
118
      <varlistentry>
138
119
        <term><option>priority<literal> = </literal><replaceable
139
120
        >STRING</replaceable></option></term>
141
122
          <xi:include href="mandos-options.xml" xpointer="priority"/>
142
123
        </listitem>
143
124
      </varlistentry>
144
 
 
 
125
      
145
126
      <varlistentry>
146
127
        <term><option>servicename<literal> = </literal
147
128
        ><replaceable>NAME</replaceable></option></term>
151
132
        </listitem>
152
133
      </varlistentry>
153
134
      
 
135
      <varlistentry>
 
136
        <term><option>use_dbus<literal> = </literal>{ <literal
 
137
          >1</literal> | <literal>yes</literal> | <literal
 
138
          >true</literal> | <literal>on</literal> | <literal
 
139
          >0</literal> | <literal>no</literal> | <literal
 
140
          >false</literal> | <literal>off</literal> }</option></term>
 
141
        <listitem>
 
142
          <xi:include href="mandos-options.xml" xpointer="dbus"/>
 
143
        </listitem>
 
144
      </varlistentry>
 
145
      
 
146
      <varlistentry>
 
147
        <term><option>use_ipv6<literal> = </literal>{ <literal
 
148
          >1</literal> | <literal>yes</literal> | <literal
 
149
          >true</literal> | <literal>on</literal> | <literal
 
150
          >0</literal> | <literal>no</literal> | <literal
 
151
          >false</literal> | <literal>off</literal> }</option></term>
 
152
        <listitem>
 
153
          <xi:include href="mandos-options.xml" xpointer="ipv6"/>
 
154
        </listitem>
 
155
      </varlistentry>
 
156
      
154
157
    </variablelist>
155
158
  </refsect1>
156
159
  
166
169
    <para>
167
170
      The <literal>[DEFAULT]</literal> is necessary because the Python
168
171
      built-in module <systemitem class="library">ConfigParser</systemitem>
169
 
      requres it.
 
172
      requires it.
170
173
    </para>
171
174
  </refsect1>
172
175
  
188
191
[DEFAULT]
189
192
# A configuration example
190
193
interface = eth0
191
 
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
 
194
address = fe80::aede:48ff:fe71:f6f2
192
195
port = 1025
193
196
debug = true
194
197
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
195
198
servicename = Daena
 
199
use_dbus = False
 
200
use_ipv6 = True
196
201
      </programlisting>
197
202
    </informalexample>
198
203
  </refsect1>
200
205
  <refsect1 id="see_also">
201
206
    <title>SEE ALSO</title>
202
207
    <para>
 
208
      <citerefentry><refentrytitle>intro</refentrytitle>
 
209
      <manvolnum>8mandos</manvolnum></citerefentry>,
203
210
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
204
211
      ><manvolnum>3</manvolnum></citerefentry>,
205
212
      <citerefentry><refentrytitle>mandos</refentrytitle>
207
214
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
208
215
      <manvolnum>5</manvolnum></citerefentry>
209
216
    </para>
210
 
 
 
217
    
211
218
    <variablelist>
212
219
      <varlistentry>
213
220
        <term>
233
240
              <para>
234
241
                The clients use IPv6 link-local addresses, which are
235
242
                immediately usable since a link-local addresses is
236
 
                automatically assigned to a network interfaces when it
 
243
                automatically assigned to a network interface when it
237
244
                is brought up.
238
245
              </para>
239
246
            </listitem>