/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
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 "2008-12-28">
 
6
<!ENTITY TIMESTAMP "2012-01-01">
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@fukt.bsnet.se</email>
 
23
          <email>belorn@recompile.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@fukt.bsnet.se</email>
 
30
          <email>teddy@recompile.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
      <year>2012</year>
36
39
      <holder>Teddy Hogeborn</holder>
37
40
      <holder>Björn Påhlsson</holder>
38
41
    </copyright>
141
144
        </listitem>
142
145
      </varlistentry>
143
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
      
144
177
    </variablelist>
145
178
  </refsect1>
146
179
  
178
211
[DEFAULT]
179
212
# A configuration example
180
213
interface = eth0
181
 
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
 
214
address = fe80::aede:48ff:fe71:f6f2
182
215
port = 1025
183
216
debug = true
184
217
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
185
218
servicename = Daena
186
219
use_dbus = False
 
220
use_ipv6 = True
 
221
restore = True
 
222
statedir = /var/lib/mandos
187
223
      </programlisting>
188
224
    </informalexample>
189
225
  </refsect1>
191
227
  <refsect1 id="see_also">
192
228
    <title>SEE ALSO</title>
193
229
    <para>
 
230
      <citerefentry><refentrytitle>intro</refentrytitle>
 
231
      <manvolnum>8mandos</manvolnum></citerefentry>,
194
232
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
195
233
      ><manvolnum>3</manvolnum></citerefentry>,
196
234
      <citerefentry><refentrytitle>mandos</refentrytitle>
224
262
              <para>
225
263
                The clients use IPv6 link-local addresses, which are
226
264
                immediately usable since a link-local addresses is
227
 
                automatically assigned to a network interfaces when it
 
265
                automatically assigned to a network interface when it
228
266
                is brought up.
229
267
              </para>
230
268
            </listitem>