/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

Use D-Bus properties instead of our own methods.

* mandos (Client._datetime_to_milliseconds): Renamed to
                                             "_timedelta_to_milliseconds".
                                             All callers changed.
  (dbus_service_property): New decorator for D-Bus properties.
  (DBusPropertyException, DBusPropertyAccessException,
  DBusPropertyNotFound): New D-Bus exception classes.
  (DBusObjectWithProperties): New; extends "dbus.service.Object" with
                              support for properties.
  (ClientDBus): Inherit from, and call up to, "DBusObjectWithProperties".
  (ClientDBus.CheckedOK, ClientDBus.GetAllProperties,
  ClientDBus.SetChecker, ClientDBus.SetHost, ClientDBus.SetInterval,
  ClientDBus.SetSecret, ClientDBus.SetTimeout, ClientDBus.Enable,
  ClientDBus.StartChecker, ClientDBus.Disable,
  ClientDBus.StopChecker): Removed, replaced with properties.
  (ClientDBus.IsStillValid): Removed, superfluous.
  (ClientDBus.name_dbus_property,
  ClientDBus.fingerprint_dbus_property, ClientDBus.host_dbus_property,
  ClientDBus.created_dbus_property,
  ClientDBus.last_enabled_dbus_property,
  ClientDBus.enabled_dbus_property,
  ClientDBus.last_checked_ok_dbus_property,
  ClientDBus.timeout_dbus_property, ClientDBus.interval_dbus_property,
  ClientDBus.checker_dbus_property,
  ClientDBus.checker_running_dbus_property,
  ClientDBus.object_path_dbus_property,
  ClientDBus.secret_dbus_property): New D-Bus properties.

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 "2009-02-25">
 
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>
32
33
    </authorgroup>
33
34
    <copyright>
34
35
      <year>2008</year>
 
36
      <year>2009</year>
35
37
      <holder>Teddy Hogeborn</holder>
36
38
      <holder>Björn Påhlsson</holder>
37
39
    </copyright>
38
40
    <xi:include href="legalnotice.xml"/>
39
41
  </refentryinfo>
40
 
 
 
42
  
41
43
  <refmeta>
42
44
    <refentrytitle>&CONFNAME;</refentrytitle>
43
45
    <manvolnum>5</manvolnum>
49
51
      Configuration file for the Mandos server
50
52
    </refpurpose>
51
53
  </refnamediv>
52
 
 
 
54
  
53
55
  <refsynopsisdiv>
54
56
    <synopsis>&CONFPATH;</synopsis>
55
57
  </refsynopsisdiv>
56
 
 
 
58
  
57
59
  <refsect1 id="description">
58
60
    <title>DESCRIPTION</title>
59
61
    <para>
71
73
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
72
74
      to provide comments.
73
75
    </para>
74
 
 
 
76
    
75
77
  </refsect1>
76
78
  <refsect1>
77
79
    <title>OPTIONS</title>
84
86
          <xi:include href="mandos-options.xml" xpointer="interface"/>
85
87
        </listitem>
86
88
      </varlistentry>
87
 
 
 
89
      
88
90
      <varlistentry>
89
91
        <term><option>address<literal> = </literal><replaceable
90
92
          >ADDRESS</replaceable></option></term>
92
94
          <xi:include href="mandos-options.xml" xpointer="address"/>
93
95
        </listitem>
94
96
      </varlistentry>
95
 
 
 
97
      
96
98
      <varlistentry>
97
99
        <term><option>port<literal> = </literal><replaceable
98
100
        >NUMBER</replaceable></option></term>
100
102
          <xi:include href="mandos-options.xml" xpointer="port"/>
101
103
        </listitem>
102
104
      </varlistentry>
103
 
 
 
105
      
104
106
      <varlistentry>
105
107
        <term><option>debug<literal> = </literal>{ <literal
106
108
          >1</literal> | <literal>yes</literal> | <literal
111
113
          <xi:include href="mandos-options.xml" xpointer="debug"/>
112
114
        </listitem>
113
115
      </varlistentry>
114
 
 
 
116
      
115
117
      <varlistentry>
116
118
        <term><option>priority<literal> = </literal><replaceable
117
119
        >STRING</replaceable></option></term>
119
121
          <xi:include href="mandos-options.xml" xpointer="priority"/>
120
122
        </listitem>
121
123
      </varlistentry>
122
 
 
 
124
      
123
125
      <varlistentry>
124
126
        <term><option>servicename<literal> = </literal
125
127
        ><replaceable>NAME</replaceable></option></term>
129
131
        </listitem>
130
132
      </varlistentry>
131
133
      
 
134
      <varlistentry>
 
135
        <term><option>use_dbus<literal> = </literal>{ <literal
 
136
          >1</literal> | <literal>yes</literal> | <literal
 
137
          >true</literal> | <literal>on</literal> | <literal
 
138
          >0</literal> | <literal>no</literal> | <literal
 
139
          >false</literal> | <literal>off</literal> }</option></term>
 
140
        <listitem>
 
141
          <xi:include href="mandos-options.xml" xpointer="dbus"/>
 
142
        </listitem>
 
143
      </varlistentry>
 
144
      
 
145
      <varlistentry>
 
146
        <term><option>use_ipv6<literal> = </literal>{ <literal
 
147
          >1</literal> | <literal>yes</literal> | <literal
 
148
          >true</literal> | <literal>on</literal> | <literal
 
149
          >0</literal> | <literal>no</literal> | <literal
 
150
          >false</literal> | <literal>off</literal> }</option></term>
 
151
        <listitem>
 
152
          <xi:include href="mandos-options.xml" xpointer="ipv6"/>
 
153
        </listitem>
 
154
      </varlistentry>
 
155
      
132
156
    </variablelist>
133
157
  </refsect1>
134
158
  
144
168
    <para>
145
169
      The <literal>[DEFAULT]</literal> is necessary because the Python
146
170
      built-in module <systemitem class="library">ConfigParser</systemitem>
147
 
      requres it.
 
171
      requires it.
148
172
    </para>
149
173
  </refsect1>
150
174
  
166
190
[DEFAULT]
167
191
# A configuration example
168
192
interface = eth0
169
 
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
 
193
address = fe80::aede:48ff:fe71:f6f2
170
194
port = 1025
171
195
debug = true
172
196
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
173
197
servicename = Daena
 
198
use_dbus = False
 
199
use_ipv6 = True
174
200
      </programlisting>
175
201
    </informalexample>
176
202
  </refsect1>
185
211
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
186
212
      <manvolnum>5</manvolnum></citerefentry>
187
213
    </para>
188
 
 
 
214
    
189
215
    <variablelist>
190
216
      <varlistentry>
191
217
        <term>
211
237
              <para>
212
238
                The clients use IPv6 link-local addresses, which are
213
239
                immediately usable since a link-local addresses is
214
 
                automatically assigned to a network interfaces when it
 
240
                automatically assigned to a network interface when it
215
241
                is brought up.
216
242
              </para>
217
243
            </listitem>