/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
1
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-31">
 
6
<!ENTITY TIMESTAMP "2008-12-28">
 
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>
37
38
    </copyright>
38
39
    <xi:include href="legalnotice.xml"/>
39
40
  </refentryinfo>
40
 
 
 
41
  
41
42
  <refmeta>
42
43
    <refentrytitle>&CONFNAME;</refentrytitle>
43
44
    <manvolnum>5</manvolnum>
49
50
      Configuration file for the Mandos server
50
51
    </refpurpose>
51
52
  </refnamediv>
52
 
 
 
53
  
53
54
  <refsynopsisdiv>
54
55
    <synopsis>&CONFPATH;</synopsis>
55
56
  </refsynopsisdiv>
56
 
 
 
57
  
57
58
  <refsect1 id="description">
58
59
    <title>DESCRIPTION</title>
59
60
    <para>
71
72
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
72
73
      to provide comments.
73
74
    </para>
74
 
 
 
75
    
75
76
  </refsect1>
76
77
  <refsect1>
77
78
    <title>OPTIONS</title>
84
85
          <xi:include href="mandos-options.xml" xpointer="interface"/>
85
86
        </listitem>
86
87
      </varlistentry>
87
 
 
 
88
      
88
89
      <varlistentry>
89
90
        <term><option>address<literal> = </literal><replaceable
90
91
          >ADDRESS</replaceable></option></term>
92
93
          <xi:include href="mandos-options.xml" xpointer="address"/>
93
94
        </listitem>
94
95
      </varlistentry>
95
 
 
 
96
      
96
97
      <varlistentry>
97
98
        <term><option>port<literal> = </literal><replaceable
98
99
        >NUMBER</replaceable></option></term>
100
101
          <xi:include href="mandos-options.xml" xpointer="port"/>
101
102
        </listitem>
102
103
      </varlistentry>
103
 
 
 
104
      
104
105
      <varlistentry>
105
106
        <term><option>debug<literal> = </literal>{ <literal
106
107
          >1</literal> | <literal>yes</literal> | <literal
111
112
          <xi:include href="mandos-options.xml" xpointer="debug"/>
112
113
        </listitem>
113
114
      </varlistentry>
114
 
 
 
115
      
115
116
      <varlistentry>
116
117
        <term><option>priority<literal> = </literal><replaceable
117
118
        >STRING</replaceable></option></term>
119
120
          <xi:include href="mandos-options.xml" xpointer="priority"/>
120
121
        </listitem>
121
122
      </varlistentry>
122
 
 
 
123
      
123
124
      <varlistentry>
124
125
        <term><option>servicename<literal> = </literal
125
126
        ><replaceable>NAME</replaceable></option></term>
129
130
        </listitem>
130
131
      </varlistentry>
131
132
      
 
133
      <varlistentry>
 
134
        <term><option>use_dbus<literal> = </literal>{ <literal
 
135
          >1</literal> | <literal>yes</literal> | <literal
 
136
          >true</literal> | <literal>on</literal> | <literal
 
137
          >0</literal> | <literal>no</literal> | <literal
 
138
          >false</literal> | <literal>off</literal> }</option></term>
 
139
        <listitem>
 
140
          <xi:include href="mandos-options.xml" xpointer="dbus"/>
 
141
        </listitem>
 
142
      </varlistentry>
 
143
      
132
144
    </variablelist>
133
145
  </refsect1>
134
146
  
144
156
    <para>
145
157
      The <literal>[DEFAULT]</literal> is necessary because the Python
146
158
      built-in module <systemitem class="library">ConfigParser</systemitem>
147
 
      requres it.
 
159
      requires it.
148
160
    </para>
149
161
  </refsect1>
150
162
  
171
183
debug = true
172
184
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
173
185
servicename = Daena
 
186
use_dbus = False
174
187
      </programlisting>
175
188
    </informalexample>
176
189
  </refsect1>
185
198
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
186
199
      <manvolnum>5</manvolnum></citerefentry>
187
200
    </para>
188
 
 
 
201
    
189
202
    <variablelist>
190
203
      <varlistentry>
191
204
        <term>