/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 at recompile
  • Date: 2012-02-26 11:47:19 UTC
  • mto: (237.7.109 trunk)
  • mto: This revision was merged to the branch mainline in revision 300.
  • Revision ID: teddy@recompile.se-20120226114719-m3odq4s34ebt6hg8
Add facilities for D-Bus interface annotations and use them to mark
the old D-Bus interfaces as deprecated.

* mandos (dbus_interface_annotations): New decorator.
  (DBusObjectWithProperties._is_dbus_property): Removed.  All callers
                                                changed.
  (DBusObjectWithProperties._is_dbus_thing): New; generalized version
                                             of "_is_dbus_property".
  (DBusObjectWithProperties._get_all_dbus_properties): Removed.  All
                                                       callers
                                                       changed.
  (DBusObjectWithProperties._get_all_dbus_things): New; generalized
                                                   version of
                                                   "_get_all_dbus_properties".
  (DBusObjectWithProperties.Introspect): Also add interface
                                         annotation tags.
  (AlternateDBusNamesMetaclass.__new__): Also copy interface
                                         annotations.  Add
                                         "deprecated" annotation on
                                         old interface.
  (ClientDBus._foo): New interface annotation to mark non-compliance
                     with the standard property change signal
                     interface.
  (MandosDBusService): Inherit from DBusObjectWithProperties to get
                       interface annotation support.
  (MandosDBusService._foo): New interface annotation to mark
                            non-compliance with the standard property
                            change signal interface.

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 "2012-01-01">
 
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>
 
38
      <year>2012</year>
35
39
      <holder>Teddy Hogeborn</holder>
36
40
      <holder>Björn Påhlsson</holder>
37
41
    </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>
 
42
    <xi:include href="legalnotice.xml"/>
61
43
  </refentryinfo>
62
 
 
 
44
  
63
45
  <refmeta>
64
46
    <refentrytitle>&CONFNAME;</refentrytitle>
65
47
    <manvolnum>5</manvolnum>
71
53
      Configuration file for the Mandos server
72
54
    </refpurpose>
73
55
  </refnamediv>
74
 
 
 
56
  
75
57
  <refsynopsisdiv>
76
58
    <synopsis>&CONFPATH;</synopsis>
77
59
  </refsynopsisdiv>
78
 
 
 
60
  
79
61
  <refsect1 id="description">
80
62
    <title>DESCRIPTION</title>
81
63
    <para>
93
75
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
94
76
      to provide comments.
95
77
    </para>
96
 
 
 
78
    
97
79
  </refsect1>
98
80
  <refsect1>
99
81
    <title>OPTIONS</title>
106
88
          <xi:include href="mandos-options.xml" xpointer="interface"/>
107
89
        </listitem>
108
90
      </varlistentry>
109
 
 
 
91
      
110
92
      <varlistentry>
111
93
        <term><option>address<literal> = </literal><replaceable
112
94
          >ADDRESS</replaceable></option></term>
114
96
          <xi:include href="mandos-options.xml" xpointer="address"/>
115
97
        </listitem>
116
98
      </varlistentry>
117
 
 
 
99
      
118
100
      <varlistentry>
119
101
        <term><option>port<literal> = </literal><replaceable
120
102
        >NUMBER</replaceable></option></term>
122
104
          <xi:include href="mandos-options.xml" xpointer="port"/>
123
105
        </listitem>
124
106
      </varlistentry>
125
 
 
 
107
      
126
108
      <varlistentry>
127
109
        <term><option>debug<literal> = </literal>{ <literal
128
110
          >1</literal> | <literal>yes</literal> | <literal
133
115
          <xi:include href="mandos-options.xml" xpointer="debug"/>
134
116
        </listitem>
135
117
      </varlistentry>
136
 
 
 
118
      
137
119
      <varlistentry>
138
120
        <term><option>priority<literal> = </literal><replaceable
139
121
        >STRING</replaceable></option></term>
141
123
          <xi:include href="mandos-options.xml" xpointer="priority"/>
142
124
        </listitem>
143
125
      </varlistentry>
144
 
 
 
126
      
145
127
      <varlistentry>
146
128
        <term><option>servicename<literal> = </literal
147
129
        ><replaceable>NAME</replaceable></option></term>
151
133
        </listitem>
152
134
      </varlistentry>
153
135
      
 
136
      <varlistentry>
 
137
        <term><option>use_dbus<literal> = </literal>{ <literal
 
138
          >1</literal> | <literal>yes</literal> | <literal
 
139
          >true</literal> | <literal>on</literal> | <literal
 
140
          >0</literal> | <literal>no</literal> | <literal
 
141
          >false</literal> | <literal>off</literal> }</option></term>
 
142
        <listitem>
 
143
          <xi:include href="mandos-options.xml" xpointer="dbus"/>
 
144
        </listitem>
 
145
      </varlistentry>
 
146
      
 
147
      <varlistentry>
 
148
        <term><option>use_ipv6<literal> = </literal>{ <literal
 
149
          >1</literal> | <literal>yes</literal> | <literal
 
150
          >true</literal> | <literal>on</literal> | <literal
 
151
          >0</literal> | <literal>no</literal> | <literal
 
152
          >false</literal> | <literal>off</literal> }</option></term>
 
153
        <listitem>
 
154
          <xi:include href="mandos-options.xml" xpointer="ipv6"/>
 
155
        </listitem>
 
156
      </varlistentry>
 
157
      
 
158
      <varlistentry>
 
159
        <term><option>restore<literal> = </literal>{ <literal
 
160
          >1</literal> | <literal>yes</literal> | <literal
 
161
          >true</literal> | <literal>on</literal> | <literal
 
162
          >0</literal> | <literal>no</literal> | <literal
 
163
          >false</literal> | <literal>off</literal> }</option></term>
 
164
        <listitem>
 
165
          <xi:include href="mandos-options.xml" xpointer="restore"/>
 
166
        </listitem>
 
167
      </varlistentry>
 
168
      
 
169
      <varlistentry>
 
170
        <term><option>statedir<literal> = </literal><replaceable
 
171
        >DIRECTORY</replaceable></option></term>
 
172
        <listitem>
 
173
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
 
174
        </listitem>
 
175
      </varlistentry>
 
176
      
154
177
    </variablelist>
155
178
  </refsect1>
156
179
  
166
189
    <para>
167
190
      The <literal>[DEFAULT]</literal> is necessary because the Python
168
191
      built-in module <systemitem class="library">ConfigParser</systemitem>
169
 
      requres it.
 
192
      requires it.
170
193
    </para>
171
194
  </refsect1>
172
195
  
188
211
[DEFAULT]
189
212
# A configuration example
190
213
interface = eth0
191
 
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
 
214
address = fe80::aede:48ff:fe71:f6f2
192
215
port = 1025
193
216
debug = true
194
217
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
195
218
servicename = Daena
 
219
use_dbus = False
 
220
use_ipv6 = True
 
221
restore = True
 
222
statedir = /var/lib/mandos
196
223
      </programlisting>
197
224
    </informalexample>
198
225
  </refsect1>
200
227
  <refsect1 id="see_also">
201
228
    <title>SEE ALSO</title>
202
229
    <para>
 
230
      <citerefentry><refentrytitle>intro</refentrytitle>
 
231
      <manvolnum>8mandos</manvolnum></citerefentry>,
203
232
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
204
233
      ><manvolnum>3</manvolnum></citerefentry>,
205
234
      <citerefentry><refentrytitle>mandos</refentrytitle>
207
236
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
208
237
      <manvolnum>5</manvolnum></citerefentry>
209
238
    </para>
210
 
 
 
239
    
211
240
    <variablelist>
212
241
      <varlistentry>
213
242
        <term>
233
262
              <para>
234
263
                The clients use IPv6 link-local addresses, which are
235
264
                immediately usable since a link-local addresses is
236
 
                automatically assigned to a network interfaces when it
 
265
                automatically assigned to a network interface when it
237
266
                is brought up.
238
267
              </para>
239
268
            </listitem>