/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: 2011-09-18 15:59:05 UTC
  • mfrom: (24.1.179 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110918155905-ngj2ig0yheralj1s
* DBUS-API: Document new "Expires" and "ExtendedTimeout" properties.
* README: Refer to the installed manual page more simply.
* mandos (Client.extended_timeout, Client.expires): New attributes.
  (Client.extended_timeout_milliseconds): New.
  (Client.__init__, Client.enable, Client.disable): Set new attributes.
  (Client.checked_ok): Take new "timeout" argument.
  (ClientDBus.expires): Transform into a property which sends a D-Bus
                        signal when changed.
  (ClientDBus._datetime_to_dbus): Return empty D-Bus string on None.
                                  All callers changed to use this.

  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property,
  ClientDBus.Host_dbus_property, ClientDBus.Timeout_dbus_property,
  ClientDBus.Interval_dbus_property,
  ClientDBus.Checker_dbus_property): Bug fix: Only send D-Bus signal
                                     if new value is different.
  (ClientDBus.Timeout_dbus_property): Use new "expires" attribute.
  (ClientDBus.Expires_dbus_property,
  ClientDBus.ExtendedTimeout_dbus_property): New D-Bus properties.
  (ClientHandler.handle): Bump time using extended_timeout value.
  (main.client_defaults): Change default values of "timeout" and
                          "interval", added new default value for
                          "extended_timeout".
* mandos-clients.conf.xml (OPTIONS): Changed default values of
                                     "interval" and "timeout".  Add
                                     new "extended_timeout" option.
  (EXAMPLE): Updated default values.
* mandos-ctl: Show new "ExtendedTimeout" D-Bus property and change it
              using new "--extended-timeout" option.
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new
                                      "--extended-timeout" option.
* mandos-monitor (MandosClientWidget.update): Use new "Expires" D-Bus
                                              property.
* mandos.xml (DESCRIPTION): Add reference to intro(8mandos) manual
                            page.
  (CHECKING): Refer to the new "extended_timeout" option in
  clients.conf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
1
 
<?xml version='1.0' encoding='UTF-8'?>
 
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 OVERVIEW SYSTEM "overview.xml">
 
6
<!ENTITY TIMESTAMP "2011-08-08">
 
7
<!ENTITY % common SYSTEM "common.ent">
 
8
%common;
8
9
]>
9
10
 
10
11
<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
11
12
  <refentryinfo>
12
 
    <title>&CONFNAME;</title>
 
13
    <title>Mandos Manual</title>
13
14
    <!-- NWalsh’s docbook scripts use this to generate the footer: -->
14
 
    <productname>&CONFNAME;</productname>
15
 
    <productnumber>&VERSION;</productnumber>
 
15
    <productname>Mandos</productname>
 
16
    <productnumber>&version;</productnumber>
 
17
    <date>&TIMESTAMP;</date>
16
18
    <authorgroup>
17
19
      <author>
18
20
        <firstname>Björn</firstname>
31
33
    </authorgroup>
32
34
    <copyright>
33
35
      <year>2008</year>
 
36
      <year>2009</year>
 
37
      <year>2011</year>
34
38
      <holder>Teddy Hogeborn</holder>
35
39
      <holder>Björn Påhlsson</holder>
36
40
    </copyright>
37
 
    <legalnotice>
38
 
      <para>
39
 
        This manual page is free software: you can redistribute it
40
 
        and/or modify it under the terms of the GNU General Public
41
 
        License as published by the Free Software Foundation,
42
 
        either version 3 of the License, or (at your option) any
43
 
        later version.
44
 
      </para>
45
 
 
46
 
      <para>
47
 
        This manual page is distributed in the hope that it will
48
 
        be useful, but WITHOUT ANY WARRANTY; without even the
49
 
        implied warranty of MERCHANTABILITY or FITNESS FOR A
50
 
        PARTICULAR PURPOSE.  See the GNU General Public License
51
 
        for more details.
52
 
      </para>
53
 
 
54
 
      <para>
55
 
        You should have received a copy of the GNU General Public
56
 
        License along with this program; If not, see
57
 
        <ulink url="http://www.gnu.org/licenses/"/>.
58
 
      </para>
59
 
    </legalnotice>
 
41
    <xi:include href="legalnotice.xml"/>
60
42
  </refentryinfo>
61
 
 
 
43
  
62
44
  <refmeta>
63
45
    <refentrytitle>&CONFNAME;</refentrytitle>
64
46
    <manvolnum>5</manvolnum>
70
52
      Configuration file for the Mandos server
71
53
    </refpurpose>
72
54
  </refnamediv>
73
 
 
 
55
  
74
56
  <refsynopsisdiv>
75
 
    <synopsis>
76
 
      &CONFPATH;
77
 
    </synopsis>
 
57
    <synopsis>&CONFPATH;</synopsis>
78
58
  </refsynopsisdiv>
79
 
 
 
59
  
80
60
  <refsect1 id="description">
81
61
    <title>DESCRIPTION</title>
82
62
    <para>
83
63
      The file &CONFPATH; is a simple configuration file for
84
64
      <citerefentry><refentrytitle>mandos</refentrytitle>
85
65
      <manvolnum>8</manvolnum></citerefentry>, and is read by it at
86
 
      startup.  The configuration file starts with
87
 
      <quote><literal>[DEFAULT]</literal></quote> on a line by itself,
88
 
      followed by any number of
89
 
      <quote><varname><replaceable>option</replaceable></varname>=<replaceable>value</replaceable></quote>
90
 
      entries, with continuations in the style of RFC 822.
91
 
      <quote><varname><replaceable>option</replaceable></varname>:
92
 
      <replaceable>value</replaceable></quote> is also accepted.  Note
93
 
      that leading whitespace is removed from values.  Lines beginning
94
 
      with <quote>#</quote> or <quote>;</quote> are ignored and may be
95
 
      used to provide comments.
 
66
      startup.  The configuration file starts with <quote><literal
 
67
      >[DEFAULT]</literal></quote> on a line by itself, followed by
 
68
      any number of <quote><varname><replaceable>option</replaceable
 
69
      ></varname>=<replaceable>value</replaceable></quote> entries,
 
70
      with continuations in the style of RFC 822.  <quote><varname
 
71
      ><replaceable>option</replaceable></varname>: <replaceable
 
72
      >value</replaceable></quote> is also accepted.  Note that
 
73
      leading whitespace is removed from values.  Lines beginning with
 
74
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
 
75
      to provide comments.
96
76
    </para>
97
 
 
 
77
    
98
78
  </refsect1>
99
79
  <refsect1>
100
80
    <title>OPTIONS</title>
101
81
    
102
82
    <variablelist>
103
83
      <varlistentry>
104
 
        <term><varname>interface</varname></term>
 
84
        <term><option>interface<literal> = </literal><replaceable
 
85
        >NAME</replaceable></option></term>
105
86
        <listitem>
106
 
          <synopsis><literal>interface = </literal><replaceable
107
 
          >IF</replaceable>
108
 
          </synopsis>
109
87
          <xi:include href="mandos-options.xml" xpointer="interface"/>
110
88
        </listitem>
111
89
      </varlistentry>
112
 
 
 
90
      
113
91
      <varlistentry>
114
 
        <term><varname>address</varname></term>
 
92
        <term><option>address<literal> = </literal><replaceable
 
93
          >ADDRESS</replaceable></option></term>
115
94
        <listitem>
116
 
          <synopsis><literal>address = </literal><replaceable
117
 
          >ADDRESS</replaceable>
118
 
          </synopsis>
119
95
          <xi:include href="mandos-options.xml" xpointer="address"/>
120
96
        </listitem>
121
97
      </varlistentry>
122
 
 
 
98
      
123
99
      <varlistentry>
124
 
        <term><varname>port</varname></term>
 
100
        <term><option>port<literal> = </literal><replaceable
 
101
        >NUMBER</replaceable></option></term>
125
102
        <listitem>
126
 
          <synopsis><literal>port = </literal><replaceable
127
 
          >PORT</replaceable>
128
 
          </synopsis>
129
103
          <xi:include href="mandos-options.xml" xpointer="port"/>
130
104
        </listitem>
131
105
      </varlistentry>
132
 
 
 
106
      
133
107
      <varlistentry>
134
 
        <term><varname>debug</varname></term>
135
 
        <listitem>
136
 
          <synopsis><literal>debug = </literal>{ <literal
 
108
        <term><option>debug<literal> = </literal>{ <literal
137
109
          >1</literal> | <literal>yes</literal> | <literal
138
110
          >true</literal> | <literal>on</literal> | <literal
139
111
          >0</literal> | <literal>no</literal> | <literal
140
 
          >false</literal> | <literal>off</literal> }
141
 
          </synopsis>
 
112
          >false</literal> | <literal>off</literal> }</option></term>
 
113
        <listitem>
142
114
          <xi:include href="mandos-options.xml" xpointer="debug"/>
143
115
        </listitem>
144
116
      </varlistentry>
145
 
 
 
117
      
146
118
      <varlistentry>
147
 
        <term><varname>priority</varname></term>
 
119
        <term><option>priority<literal> = </literal><replaceable
 
120
        >STRING</replaceable></option></term>
148
121
        <listitem>
149
 
          <synopsis><literal>priority = </literal><replaceable
150
 
          >PRIORITY</replaceable>
151
 
          </synopsis>
152
122
          <xi:include href="mandos-options.xml" xpointer="priority"/>
153
123
        </listitem>
154
124
      </varlistentry>
155
 
 
 
125
      
156
126
      <varlistentry>
157
 
        <term><varname>servicename</varname></term>
 
127
        <term><option>servicename<literal> = </literal
 
128
        ><replaceable>NAME</replaceable></option></term>
158
129
        <listitem>
159
 
          <synopsis><literal>servicename = </literal><replaceable
160
 
          >NAME</replaceable>
161
 
          </synopsis>
162
130
          <xi:include href="mandos-options.xml"
163
131
                      xpointer="servicename"/>
164
132
        </listitem>
165
133
      </varlistentry>
166
134
      
 
135
      <varlistentry>
 
136
        <term><option>use_dbus<literal> = </literal>{ <literal
 
137
          >1</literal> | <literal>yes</literal> | <literal
 
138
          >true</literal> | <literal>on</literal> | <literal
 
139
          >0</literal> | <literal>no</literal> | <literal
 
140
          >false</literal> | <literal>off</literal> }</option></term>
 
141
        <listitem>
 
142
          <xi:include href="mandos-options.xml" xpointer="dbus"/>
 
143
        </listitem>
 
144
      </varlistentry>
 
145
      
 
146
      <varlistentry>
 
147
        <term><option>use_ipv6<literal> = </literal>{ <literal
 
148
          >1</literal> | <literal>yes</literal> | <literal
 
149
          >true</literal> | <literal>on</literal> | <literal
 
150
          >0</literal> | <literal>no</literal> | <literal
 
151
          >false</literal> | <literal>off</literal> }</option></term>
 
152
        <listitem>
 
153
          <xi:include href="mandos-options.xml" xpointer="ipv6"/>
 
154
        </listitem>
 
155
      </varlistentry>
 
156
      
167
157
    </variablelist>
168
158
  </refsect1>
169
159
  
179
169
    <para>
180
170
      The <literal>[DEFAULT]</literal> is necessary because the Python
181
171
      built-in module <systemitem class="library">ConfigParser</systemitem>
182
 
      requres it.
 
172
      requires it.
183
173
    </para>
184
174
  </refsect1>
185
175
  
201
191
[DEFAULT]
202
192
# A configuration example
203
193
interface = eth0
204
 
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
 
194
address = fe80::aede:48ff:fe71:f6f2
205
195
port = 1025
206
196
debug = true
207
197
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
208
198
servicename = Daena
 
199
use_dbus = False
 
200
use_ipv6 = True
209
201
      </programlisting>
210
202
    </informalexample>
211
203
  </refsect1>
213
205
  <refsect1 id="see_also">
214
206
    <title>SEE ALSO</title>
215
207
    <para>
216
 
      <citerefentry>
217
 
        <refentrytitle>mandos</refentrytitle>
218
 
        <manvolnum>8</manvolnum></citerefentry>, <citerefentry>
219
 
        <refentrytitle>mandos-clients.conf</refentrytitle>
220
 
        <manvolnum>5</manvolnum></citerefentry>
 
208
      <citerefentry><refentrytitle>intro</refentrytitle>
 
209
      <manvolnum>8mandos</manvolnum></citerefentry>,
 
210
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
 
211
      ><manvolnum>3</manvolnum></citerefentry>,
 
212
      <citerefentry><refentrytitle>mandos</refentrytitle>
 
213
      <manvolnum>8</manvolnum></citerefentry>,
 
214
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
 
215
      <manvolnum>5</manvolnum></citerefentry>
221
216
    </para>
 
217
    
 
218
    <variablelist>
 
219
      <varlistentry>
 
220
        <term>
 
221
          RFC 4291: <citetitle>IP Version 6 Addressing
 
222
          Architecture</citetitle>
 
223
        </term>
 
224
        <listitem>
 
225
          <variablelist>
 
226
            <varlistentry>
 
227
              <term>Section 2.2: <citetitle>Text Representation of
 
228
              Addresses</citetitle></term>
 
229
              <listitem><para/></listitem>
 
230
            </varlistentry>
 
231
            <varlistentry>
 
232
              <term>Section 2.5.5.2: <citetitle>IPv4-Mapped IPv6
 
233
              Address</citetitle></term>
 
234
              <listitem><para/></listitem>
 
235
            </varlistentry>
 
236
            <varlistentry>
 
237
            <term>Section 2.5.6, <citetitle>Link-Local IPv6 Unicast
 
238
            Addresses</citetitle></term>
 
239
            <listitem>
 
240
              <para>
 
241
                The clients use IPv6 link-local addresses, which are
 
242
                immediately usable since a link-local addresses is
 
243
                automatically assigned to a network interface when it
 
244
                is brought up.
 
245
              </para>
 
246
            </listitem>
 
247
            </varlistentry>
 
248
          </variablelist>
 
249
        </listitem>
 
250
      </varlistentry>
 
251
      <varlistentry>
 
252
        <term>
 
253
          <ulink url="http://www.zeroconf.org/">Zeroconf</ulink>
 
254
        </term>
 
255
        <listitem>
 
256
          <para>
 
257
            Zeroconf is the network protocol standard used by clients
 
258
            for finding the Mandos server on the local network.
 
259
          </para>
 
260
        </listitem>
 
261
      </varlistentry>
 
262
    </variablelist>
222
263
  </refsect1>
223
264
</refentry>
 
265
<!-- Local Variables: -->
 
266
<!-- time-stamp-start: "<!ENTITY TIMESTAMP [\"']" -->
 
267
<!-- time-stamp-end: "[\"']>" -->
 
268
<!-- time-stamp-format: "%:y-%02m-%02d" -->
 
269
<!-- End: -->