/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

* mandos (Client.timeout, Client.interval): Changed from being a
                                            property to be a normal
                                            attribute.
  (Client._timeout, Client._interval): Removed.
  (Client._timeout_milliseconds): Changed from being an attribute to
                                  be a method "timeout_milliseconds".
                                  All users changed.
  (Client._interval_milliseconds): Changed from being an attribute to
                                   be method "interval_milliseconds".
                                   All users changed.
  (Client.__init__): Take additional "use_dbus" keyword argument.
                     Only provide D-Bus interface if "use_dbus" is
                     True.
  (Client.use_dbus): New attribute.
  (Client.dbus_object_path): Changed to only be set if "self.use_dbus"
                             is True.
  (Client.enable, Client.disable, Client.checker_callback,
  Client.bump_timeout, Client.start_checker, Client.stop_checker):
  Only emit D-Bus signals if "self.use_dbus".
  (Client.SetChecker, Client.SetHost, Client.Enable): Bug fix: Emit
                                                      D-Bus signals.
  (Client.SetInterval, Client.SetTimeout): Changed to emit D-Bus
                                           signals.

  (main): Remove deprecated "default" keyword argument to "--check"
          option.  Added new "--no-dbus" option.  Added corresponding
          "use_dbus" server configuration option.  Only provide D-Bus
          interface and emit D-Bus signals if "use_dbus".  Pass
          "use_dbus" on to Client constructor.

* mandos-options.xml ([@id="dbus"]): New option.

* mandos.conf (use_dbus): New option.

* mandos.conf.xml (OPTIONS): New option "use_dbus".
  (EXAMPLE): - '' -

* mandos.xml (SYNOPSIS): New option "--no-dbus".
  (D-BUS INTERFACE): New section.

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 "2011-11-26">
 
6
<!ENTITY TIMESTAMP "2008-12-28">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
20
20
        <firstname>Björn</firstname>
21
21
        <surname>Påhlsson</surname>
22
22
        <address>
23
 
          <email>belorn@recompile.se</email>
 
23
          <email>belorn@fukt.bsnet.se</email>
24
24
        </address>
25
25
      </author>
26
26
      <author>
27
27
        <firstname>Teddy</firstname>
28
28
        <surname>Hogeborn</surname>
29
29
        <address>
30
 
          <email>teddy@recompile.se</email>
 
30
          <email>teddy@fukt.bsnet.se</email>
31
31
        </address>
32
32
      </author>
33
33
    </authorgroup>
34
34
    <copyright>
35
35
      <year>2008</year>
36
 
      <year>2009</year>
37
 
      <year>2011</year>
38
36
      <holder>Teddy Hogeborn</holder>
39
37
      <holder>Björn Påhlsson</holder>
40
38
    </copyright>
143
141
        </listitem>
144
142
      </varlistentry>
145
143
      
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
 
      
157
 
      <varlistentry>
158
 
        <term><option>restore<literal> = </literal>{ <literal
159
 
          >1</literal> | <literal>yes</literal> | <literal
160
 
          >true</literal> | <literal>on</literal> | <literal
161
 
          >0</literal> | <literal>no</literal> | <literal
162
 
          >false</literal> | <literal>off</literal> }</option></term>
163
 
        <listitem>
164
 
          <xi:include href="mandos-options.xml" xpointer="restore"/>
165
 
        </listitem>
166
 
      </varlistentry>
167
 
      
168
 
      <varlistentry>
169
 
        <term><option>statedir<literal> = </literal><replaceable
170
 
        >DIRECTORY</replaceable></option></term>
171
 
        <listitem>
172
 
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
173
 
        </listitem>
174
 
      </varlistentry>
175
 
      
176
144
    </variablelist>
177
145
  </refsect1>
178
146
  
210
178
[DEFAULT]
211
179
# A configuration example
212
180
interface = eth0
213
 
address = fe80::aede:48ff:fe71:f6f2
 
181
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
214
182
port = 1025
215
183
debug = true
216
184
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
217
185
servicename = Daena
218
186
use_dbus = False
219
 
use_ipv6 = True
220
 
restore = True
221
 
statedir = /var/lib/mandos
222
187
      </programlisting>
223
188
    </informalexample>
224
189
  </refsect1>
226
191
  <refsect1 id="see_also">
227
192
    <title>SEE ALSO</title>
228
193
    <para>
229
 
      <citerefentry><refentrytitle>intro</refentrytitle>
230
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
231
194
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
232
195
      ><manvolnum>3</manvolnum></citerefentry>,
233
196
      <citerefentry><refentrytitle>mandos</refentrytitle>
261
224
              <para>
262
225
                The clients use IPv6 link-local addresses, which are
263
226
                immediately usable since a link-local addresses is
264
 
                automatically assigned to a network interface when it
 
227
                automatically assigned to a network interfaces when it
265
228
                is brought up.
266
229
              </para>
267
230
            </listitem>