/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

Merge from Björn:

* mandos-ctl: New option "--remove-client".  Only default to listing
              clients if no clients were given on the command line.
* plugins.d/mandos-client.c: Lower kernel log level while bringing up
                             network interface.  New option "--delay"
                             to control the maximum delay to wait for
                             running interface.
* plugins.d/mandos-client.xml (SYNOPSIS, OPTIONS): New option
                                                   "--delay".

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 "2015-07-20">
 
6
<!ENTITY TIMESTAMP "2009-01-04">
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@recompile.se</email>
 
23
          <email>belorn@fukt.bsnet.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@recompile.se</email>
 
30
          <email>teddy@fukt.bsnet.se</email>
31
31
        </address>
32
32
      </author>
33
33
    </authorgroup>
34
34
    <copyright>
35
35
      <year>2008</year>
36
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
37
      <holder>Teddy Hogeborn</holder>
44
38
      <holder>Björn Påhlsson</holder>
45
39
    </copyright>
148
142
        </listitem>
149
143
      </varlistentry>
150
144
      
151
 
      <varlistentry>
152
 
        <term><option>use_ipv6<literal> = </literal>{ <literal
153
 
          >1</literal> | <literal>yes</literal> | <literal
154
 
          >true</literal> | <literal>on</literal> | <literal
155
 
          >0</literal> | <literal>no</literal> | <literal
156
 
          >false</literal> | <literal>off</literal> }</option></term>
157
 
        <listitem>
158
 
          <xi:include href="mandos-options.xml" xpointer="ipv6"/>
159
 
        </listitem>
160
 
      </varlistentry>
161
 
      
162
 
      <varlistentry>
163
 
        <term><option>restore<literal> = </literal>{ <literal
164
 
          >1</literal> | <literal>yes</literal> | <literal
165
 
          >true</literal> | <literal>on</literal> | <literal
166
 
          >0</literal> | <literal>no</literal> | <literal
167
 
          >false</literal> | <literal>off</literal> }</option></term>
168
 
        <listitem>
169
 
          <xi:include href="mandos-options.xml" xpointer="restore"/>
170
 
        </listitem>
171
 
      </varlistentry>
172
 
      
173
 
      <varlistentry>
174
 
        <term><option>statedir<literal> = </literal><replaceable
175
 
        >DIRECTORY</replaceable></option></term>
176
 
        <listitem>
177
 
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
178
 
        </listitem>
179
 
      </varlistentry>
180
 
      
181
 
      <varlistentry>
182
 
        <term><option>socket<literal> = </literal><replaceable
183
 
        >NUMBER</replaceable></option></term>
184
 
        <listitem>
185
 
          <xi:include href="mandos-options.xml" xpointer="socket"/>
186
 
        </listitem>
187
 
      </varlistentry>
188
 
      
189
145
    </variablelist>
190
146
  </refsect1>
191
147
  
223
179
[DEFAULT]
224
180
# A configuration example
225
181
interface = eth0
226
 
address = fe80::aede:48ff:fe71:f6f2
 
182
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
227
183
port = 1025
228
 
debug = True
229
 
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA
 
184
debug = true
 
185
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
230
186
servicename = Daena
231
187
use_dbus = False
232
 
use_ipv6 = True
233
 
restore = True
234
 
statedir = /var/lib/mandos
235
188
      </programlisting>
236
189
    </informalexample>
237
190
  </refsect1>
239
192
  <refsect1 id="see_also">
240
193
    <title>SEE ALSO</title>
241
194
    <para>
242
 
      <citerefentry><refentrytitle>intro</refentrytitle>
243
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
244
195
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
245
196
      ><manvolnum>3</manvolnum></citerefentry>,
246
197
      <citerefentry><refentrytitle>mandos</refentrytitle>
274
225
              <para>
275
226
                The clients use IPv6 link-local addresses, which are
276
227
                immediately usable since a link-local addresses is
277
 
                automatically assigned to a network interface when it
 
228
                automatically assigned to a network interfaces when it
278
229
                is brought up.
279
230
              </para>
280
231
            </listitem>