/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos.conf.xml

  • Committer: Teddy Hogeborn
  • Date: 2008-07-29 03:35:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080729033539-08zecoj3jwlkpjhw
* server.conf: New file.

* mandos-clients.conf: Renamed to clients.conf.

* Makefile (FORTIFY): New.
  (CFLAGS): Include $(FORTIFY).

* plugins.d/mandosclient.c (main): New "if_index" variable.  Bug fix:
                                   check if interface exists.  New
                                   "--connect" option.

* server.py (serviceInterface): Removed; replaced by
                                "AvahiService.interface".  All users
                                changed.
  (AvahiError, AvahiServiceError, AvahiGroupError): New exception
                                                    classes.
  (AvahiService): New class.
  (serviceName): Removed; replaced by "AvahiService.name".  All users
                 changed.
  (serviceType): Removed; replaced by "AvahiService.type".  All users
                 changed.
  (servicePort): Removed; replaced by "AvahiService.port".  All users
                 changed.
  (serviceTXT): Removed; replaced by "AvahiService.TXT".  All users
                changed.
  (domain): Removed; replaced by "AvahiService.domain".  All users
            changed.
  (host): Removed; replaced by "AvahiService.host".  All users
          changed.
  (rename_count): Removed; replaced by "AvahiService.rename_count" and
                 "AvahiService.max_renames".  All users changed.
  (Client.__init__): If no secret or secfile, raise TypeError instead
                     of RuntimeError.
  (Client.last_seen): Renamed to "Client.last_checked_ok".  All users
                      changed.
  (Client.stop, Client.stop_checker): Use "getattr" with default value
                                      instead of "hasattr".
  (Client.still_valid): Removed "now" argument.
  (Client.handle): Separate the "no client found" and "client invalid"
                   cases for clearer code.
  (IPv6_TCPServer.__init__): "options" argument replaced by
                             "settings".  All callers changed.
  (IPv6_TCPServer.options): Replaced by "IPv6_TCPServer.settings".
                            All users changed.
  (IPv6_TCPServer.server_bind): Use getattr instead of hasattr.
  (add_service): Removed; replaced by "AvahiService.add".  All callers
                 changed.
  (remove_service): Removed; replaced by "AvahiService.remove".  All
                    callers changed.
  (entry_group_state_changed): On entry group collision, call the new
                               AvahiService.rename method.  Raise
                               AvahiGroupError on group error.
  (if_nametoindex): Use ctypes.utils.find_library to locate the C
                    library.  Cache the result.  Loop on EINTR.
  (daemon): Use os.path.devnull to locate "/dev/null".
  (killme): Removed.  All callers changed to do "sys.exit()" instead,
            except where stated otherwise.
  (main): Removed "exitstatus".  Removed all default values from all
          non-bool options.  New option "--configdir".  New variables
          "server_defaults" and "server_settings", read from
          "%(configdir)s/server.conf".  Let any supplied command line
          options override server settings.   Variable "defaults"
          renamed to "client_defaults", which is read from
          "clients.conf" instead of "mandos-clients.conf".  New global
          AvahiService object "service" replaces old global variables.
          Catch AvahiError and exit with error if caught.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
1
 
<?xml version="1.0" encoding="UTF-8"?>
2
 
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
 
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
 
<!ENTITY CONFNAME "mandos.conf">
5
 
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2016-02-28">
7
 
<!ENTITY % common SYSTEM "common.ent">
8
 
%common;
9
 
]>
10
 
 
11
 
<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
12
 
  <refentryinfo>
13
 
    <title>Mandos Manual</title>
14
 
    <!-- NWalsh’s docbook scripts use this to generate the footer: -->
15
 
    <productname>Mandos</productname>
16
 
    <productnumber>&version;</productnumber>
17
 
    <date>&TIMESTAMP;</date>
18
 
    <authorgroup>
19
 
      <author>
20
 
        <firstname>Björn</firstname>
21
 
        <surname>Påhlsson</surname>
22
 
        <address>
23
 
          <email>belorn@recompile.se</email>
24
 
        </address>
25
 
      </author>
26
 
      <author>
27
 
        <firstname>Teddy</firstname>
28
 
        <surname>Hogeborn</surname>
29
 
        <address>
30
 
          <email>teddy@recompile.se</email>
31
 
        </address>
32
 
      </author>
33
 
    </authorgroup>
34
 
    <copyright>
35
 
      <year>2008</year>
36
 
      <year>2009</year>
37
 
      <year>2010</year>
38
 
      <year>2011</year>
39
 
      <year>2012</year>
40
 
      <year>2013</year>
41
 
      <year>2014</year>
42
 
      <year>2015</year>
43
 
      <year>2016</year>
44
 
      <holder>Teddy Hogeborn</holder>
45
 
      <holder>Björn Påhlsson</holder>
46
 
    </copyright>
47
 
    <xi:include href="legalnotice.xml"/>
48
 
  </refentryinfo>
49
 
  
50
 
  <refmeta>
51
 
    <refentrytitle>&CONFNAME;</refentrytitle>
52
 
    <manvolnum>5</manvolnum>
53
 
  </refmeta>
54
 
  
55
 
  <refnamediv>
56
 
    <refname><filename>&CONFNAME;</filename></refname>
57
 
    <refpurpose>
58
 
      Configuration file for the Mandos server
59
 
    </refpurpose>
60
 
  </refnamediv>
61
 
  
62
 
  <refsynopsisdiv>
63
 
    <synopsis>&CONFPATH;</synopsis>
64
 
  </refsynopsisdiv>
65
 
  
66
 
  <refsect1 id="description">
67
 
    <title>DESCRIPTION</title>
68
 
    <para>
69
 
      The file &CONFPATH; is a simple configuration file for
70
 
      <citerefentry><refentrytitle>mandos</refentrytitle>
71
 
      <manvolnum>8</manvolnum></citerefentry>, and is read by it at
72
 
      startup.  The configuration file starts with <quote><literal
73
 
      >[DEFAULT]</literal></quote> on a line by itself, followed by
74
 
      any number of <quote><varname><replaceable>option</replaceable
75
 
      ></varname>=<replaceable>value</replaceable></quote> entries,
76
 
      with continuations in the style of RFC 822.  <quote><varname
77
 
      ><replaceable>option</replaceable></varname>: <replaceable
78
 
      >value</replaceable></quote> is also accepted.  Note that
79
 
      leading whitespace is removed from values.  Lines beginning with
80
 
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
81
 
      to provide comments.
82
 
    </para>
83
 
    
84
 
  </refsect1>
85
 
  <refsect1>
86
 
    <title>OPTIONS</title>
87
 
    
88
 
    <variablelist>
89
 
      <varlistentry>
90
 
        <term><option>interface<literal> = </literal><replaceable
91
 
        >NAME</replaceable></option></term>
92
 
        <listitem>
93
 
          <xi:include href="mandos-options.xml" xpointer="interface"/>
94
 
        </listitem>
95
 
      </varlistentry>
96
 
      
97
 
      <varlistentry>
98
 
        <term><option>address<literal> = </literal><replaceable
99
 
          >ADDRESS</replaceable></option></term>
100
 
        <listitem>
101
 
          <xi:include href="mandos-options.xml" xpointer="address"/>
102
 
        </listitem>
103
 
      </varlistentry>
104
 
      
105
 
      <varlistentry>
106
 
        <term><option>port<literal> = </literal><replaceable
107
 
        >NUMBER</replaceable></option></term>
108
 
        <listitem>
109
 
          <xi:include href="mandos-options.xml" xpointer="port"/>
110
 
        </listitem>
111
 
      </varlistentry>
112
 
      
113
 
      <varlistentry>
114
 
        <term><option>debug<literal> = </literal>{ <literal
115
 
          >1</literal> | <literal>yes</literal> | <literal
116
 
          >true</literal> | <literal>on</literal> | <literal
117
 
          >0</literal> | <literal>no</literal> | <literal
118
 
          >false</literal> | <literal>off</literal> }</option></term>
119
 
        <listitem>
120
 
          <xi:include href="mandos-options.xml" xpointer="debug"/>
121
 
        </listitem>
122
 
      </varlistentry>
123
 
      
124
 
      <varlistentry>
125
 
        <term><option>priority<literal> = </literal><replaceable
126
 
        >STRING</replaceable></option></term>
127
 
        <listitem>
128
 
          <xi:include href="mandos-options.xml" xpointer="priority"/>
129
 
        </listitem>
130
 
      </varlistentry>
131
 
      
132
 
      <varlistentry>
133
 
        <term><option>servicename<literal> = </literal
134
 
        ><replaceable>NAME</replaceable></option></term>
135
 
        <listitem>
136
 
          <xi:include href="mandos-options.xml"
137
 
                      xpointer="servicename"/>
138
 
        </listitem>
139
 
      </varlistentry>
140
 
      
141
 
      <varlistentry>
142
 
        <term><option>use_dbus<literal> = </literal>{ <literal
143
 
          >1</literal> | <literal>yes</literal> | <literal
144
 
          >true</literal> | <literal>on</literal> | <literal
145
 
          >0</literal> | <literal>no</literal> | <literal
146
 
          >false</literal> | <literal>off</literal> }</option></term>
147
 
        <listitem>
148
 
          <xi:include href="mandos-options.xml" xpointer="dbus"/>
149
 
        </listitem>
150
 
      </varlistentry>
151
 
      
152
 
      <varlistentry>
153
 
        <term><option>use_ipv6<literal> = </literal>{ <literal
154
 
          >1</literal> | <literal>yes</literal> | <literal
155
 
          >true</literal> | <literal>on</literal> | <literal
156
 
          >0</literal> | <literal>no</literal> | <literal
157
 
          >false</literal> | <literal>off</literal> }</option></term>
158
 
        <listitem>
159
 
          <xi:include href="mandos-options.xml" xpointer="ipv6"/>
160
 
        </listitem>
161
 
      </varlistentry>
162
 
      
163
 
      <varlistentry>
164
 
        <term><option>restore<literal> = </literal>{ <literal
165
 
          >1</literal> | <literal>yes</literal> | <literal
166
 
          >true</literal> | <literal>on</literal> | <literal
167
 
          >0</literal> | <literal>no</literal> | <literal
168
 
          >false</literal> | <literal>off</literal> }</option></term>
169
 
        <listitem>
170
 
          <xi:include href="mandos-options.xml" xpointer="restore"/>
171
 
        </listitem>
172
 
      </varlistentry>
173
 
      
174
 
      <varlistentry>
175
 
        <term><option>statedir<literal> = </literal><replaceable
176
 
        >DIRECTORY</replaceable></option></term>
177
 
        <listitem>
178
 
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
179
 
        </listitem>
180
 
      </varlistentry>
181
 
      
182
 
      <varlistentry>
183
 
        <term><option>socket<literal> = </literal><replaceable
184
 
        >NUMBER</replaceable></option></term>
185
 
        <listitem>
186
 
          <xi:include href="mandos-options.xml" xpointer="socket"/>
187
 
        </listitem>
188
 
      </varlistentry>
189
 
      
190
 
    </variablelist>
191
 
  </refsect1>
192
 
  
193
 
  <refsect1 id="files">
194
 
    <title>FILES</title>
195
 
    <para>
196
 
      The file described here is &CONFPATH;
197
 
    </para>
198
 
  </refsect1>
199
 
  
200
 
  <refsect1 id="bugs">
201
 
    <title>BUGS</title>
202
 
    <para>
203
 
      The <literal>[DEFAULT]</literal> is necessary because the Python
204
 
      built-in module <systemitem class="library">ConfigParser</systemitem>
205
 
      requires it.
206
 
    </para>
207
 
  </refsect1>
208
 
  
209
 
  <refsect1 id="example">
210
 
    <title>EXAMPLE</title>
211
 
    <informalexample>
212
 
      <para>
213
 
        No options are actually required:
214
 
      </para>
215
 
      <programlisting>
216
 
[DEFAULT]
217
 
      </programlisting>
218
 
    </informalexample>
219
 
    <informalexample>
220
 
      <para>
221
 
        An example using all the options:
222
 
      </para>
223
 
      <programlisting>
224
 
[DEFAULT]
225
 
# A configuration example
226
 
interface = eth0
227
 
address = fe80::aede:48ff:fe71:f6f2
228
 
port = 1025
229
 
debug = True
230
 
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA
231
 
servicename = Daena
232
 
use_dbus = False
233
 
use_ipv6 = True
234
 
restore = True
235
 
statedir = /var/lib/mandos
236
 
      </programlisting>
237
 
    </informalexample>
238
 
  </refsect1>
239
 
  
240
 
  <refsect1 id="see_also">
241
 
    <title>SEE ALSO</title>
242
 
    <para>
243
 
      <citerefentry><refentrytitle>intro</refentrytitle>
244
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
245
 
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
246
 
      ><manvolnum>3</manvolnum></citerefentry>,
247
 
      <citerefentry><refentrytitle>mandos</refentrytitle>
248
 
      <manvolnum>8</manvolnum></citerefentry>,
249
 
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
250
 
      <manvolnum>5</manvolnum></citerefentry>
251
 
    </para>
252
 
    
253
 
    <variablelist>
254
 
      <varlistentry>
255
 
        <term>
256
 
          RFC 4291: <citetitle>IP Version 6 Addressing
257
 
          Architecture</citetitle>
258
 
        </term>
259
 
        <listitem>
260
 
          <variablelist>
261
 
            <varlistentry>
262
 
              <term>Section 2.2: <citetitle>Text Representation of
263
 
              Addresses</citetitle></term>
264
 
              <listitem><para/></listitem>
265
 
            </varlistentry>
266
 
            <varlistentry>
267
 
              <term>Section 2.5.5.2: <citetitle>IPv4-Mapped IPv6
268
 
              Address</citetitle></term>
269
 
              <listitem><para/></listitem>
270
 
            </varlistentry>
271
 
            <varlistentry>
272
 
            <term>Section 2.5.6, <citetitle>Link-Local IPv6 Unicast
273
 
            Addresses</citetitle></term>
274
 
            <listitem>
275
 
              <para>
276
 
                The clients use IPv6 link-local addresses, which are
277
 
                immediately usable since a link-local addresses is
278
 
                automatically assigned to a network interface when it
279
 
                is brought up.
280
 
              </para>
281
 
            </listitem>
282
 
            </varlistentry>
283
 
          </variablelist>
284
 
        </listitem>
285
 
      </varlistentry>
286
 
      <varlistentry>
287
 
        <term>
288
 
          <ulink url="http://www.zeroconf.org/">Zeroconf</ulink>
289
 
        </term>
290
 
        <listitem>
291
 
          <para>
292
 
            Zeroconf is the network protocol standard used by clients
293
 
            for finding the Mandos server on the local network.
294
 
          </para>
295
 
        </listitem>
296
 
      </varlistentry>
297
 
    </variablelist>
298
 
  </refsect1>
299
 
</refentry>
300
 
<!-- Local Variables: -->
301
 
<!-- time-stamp-start: "<!ENTITY TIMESTAMP [\"']" -->
302
 
<!-- time-stamp-end: "[\"']>" -->
303
 
<!-- time-stamp-format: "%:y-%02m-%02d" -->
304
 
<!-- End: -->