/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: 2009-02-09 02:01:13 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090209020113-726hq380zvp8zt97
Four new interrelated features:

1. Support using a different network interface via both initramfs.conf
   (the DEVICE setting) and the kernel command line (sixth field of
   the "ip=" option as in Linux' Documentation/nfsroot.txt).

2. Support connecting to a specified Mandos server directly using a
   kernel command line option ("mandos=connect:<ADDRESS>:<PORT>").

3. Support connecting directly to an IPv4 address (and port) using the
   "--connect" option of mandos-client.

4. Support an empty string to the --interface option to mandos-client.

* Makefile (WARN): Increase strictness by changing to
                   "-Wstrict-aliasing=1".

* debian/mandos-client.README.Debian (Use the Correct Network
  Interface): Changed to refer to initramfs.conf and nfsroot.txt.
  (Test the Server): Improve wording.
  (Non-local Connection): New section.
* initramfs-tools-script: Obey DEVICE environment variable and setting
                          from "/conf/initramfs.conf".  Also let any
                          "ip=" kernel command line option override
                          it.  Support new "mandos=connect" option.
                          Call "configure_networking" to set up IP
                          address on interface if necessary.
* plugin-runner.conf: Change example.
* plugins.d/mandos-client.c: Some whitespace and comment changes.
  (start_mandos_communication): Take an additional argument for
                                address family, all callers changed.
                                Connect to an IPv4 address if address
                                family is AF_INET.  Only set IPv6
                                scope_id for link-local addresses.
  (main): Accept empty interface name; this will not bring up any
         interface and leave the interface as unspecified.  Also do
         not restore kernel log level if lowering it failed.
* plugins.d/mandos-client.xml (OPTIONS): Document that the
                                         "--interface" option accepts
                                         an empty string.
  (EXAMPLE): Change example IPv6 address to a link-local address.

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 TIMESTAMP "2008-08-29">
 
6
<!ENTITY TIMESTAMP "2009-01-04">
 
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>
32
33
    </authorgroup>
33
34
    <copyright>
34
35
      <year>2008</year>
 
36
      <year>2009</year>
35
37
      <holder>Teddy Hogeborn</holder>
36
38
      <holder>Björn Påhlsson</holder>
37
39
    </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>
 
40
    <xi:include href="legalnotice.xml"/>
61
41
  </refentryinfo>
62
 
 
 
42
  
63
43
  <refmeta>
64
44
    <refentrytitle>&CONFNAME;</refentrytitle>
65
45
    <manvolnum>5</manvolnum>
71
51
      Configuration file for the Mandos server
72
52
    </refpurpose>
73
53
  </refnamediv>
74
 
 
 
54
  
75
55
  <refsynopsisdiv>
76
 
    <synopsis>
77
 
      &CONFPATH;
78
 
    </synopsis>
 
56
    <synopsis>&CONFPATH;</synopsis>
79
57
  </refsynopsisdiv>
80
 
 
 
58
  
81
59
  <refsect1 id="description">
82
60
    <title>DESCRIPTION</title>
83
61
    <para>
95
73
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
96
74
      to provide comments.
97
75
    </para>
98
 
 
 
76
    
99
77
  </refsect1>
100
78
  <refsect1>
101
79
    <title>OPTIONS</title>
102
80
    
103
81
    <variablelist>
104
82
      <varlistentry>
105
 
        <term><varname>interface</varname></term>
 
83
        <term><option>interface<literal> = </literal><replaceable
 
84
        >NAME</replaceable></option></term>
106
85
        <listitem>
107
 
          <synopsis><literal>interface = </literal><replaceable
108
 
          >NAME</replaceable>
109
 
          </synopsis>
110
86
          <xi:include href="mandos-options.xml" xpointer="interface"/>
111
87
        </listitem>
112
88
      </varlistentry>
113
 
 
 
89
      
114
90
      <varlistentry>
115
 
        <term><varname>address</varname></term>
 
91
        <term><option>address<literal> = </literal><replaceable
 
92
          >ADDRESS</replaceable></option></term>
116
93
        <listitem>
117
 
          <synopsis><literal>address = </literal><replaceable
118
 
          >ADDRESS</replaceable>
119
 
          </synopsis>
120
94
          <xi:include href="mandos-options.xml" xpointer="address"/>
121
95
        </listitem>
122
96
      </varlistentry>
123
 
 
 
97
      
124
98
      <varlistentry>
125
 
        <term><varname>port</varname></term>
 
99
        <term><option>port<literal> = </literal><replaceable
 
100
        >NUMBER</replaceable></option></term>
126
101
        <listitem>
127
 
          <synopsis><literal>port = </literal><replaceable
128
 
          >NUMBER</replaceable>
129
 
          </synopsis>
130
102
          <xi:include href="mandos-options.xml" xpointer="port"/>
131
103
        </listitem>
132
104
      </varlistentry>
133
 
 
 
105
      
134
106
      <varlistentry>
135
 
        <term><varname>debug</varname></term>
136
 
        <listitem>
137
 
          <synopsis><literal>debug = </literal>{ <literal
 
107
        <term><option>debug<literal> = </literal>{ <literal
138
108
          >1</literal> | <literal>yes</literal> | <literal
139
109
          >true</literal> | <literal>on</literal> | <literal
140
110
          >0</literal> | <literal>no</literal> | <literal
141
 
          >false</literal> | <literal>off</literal> }
142
 
          </synopsis>
 
111
          >false</literal> | <literal>off</literal> }</option></term>
 
112
        <listitem>
143
113
          <xi:include href="mandos-options.xml" xpointer="debug"/>
144
114
        </listitem>
145
115
      </varlistentry>
146
 
 
 
116
      
147
117
      <varlistentry>
148
 
        <term><varname>priority</varname></term>
 
118
        <term><option>priority<literal> = </literal><replaceable
 
119
        >STRING</replaceable></option></term>
149
120
        <listitem>
150
 
          <synopsis><literal>priority = </literal><replaceable
151
 
          >STRING</replaceable>
152
 
          </synopsis>
153
121
          <xi:include href="mandos-options.xml" xpointer="priority"/>
154
122
        </listitem>
155
123
      </varlistentry>
156
 
 
 
124
      
157
125
      <varlistentry>
158
 
        <term><varname>servicename</varname></term>
 
126
        <term><option>servicename<literal> = </literal
 
127
        ><replaceable>NAME</replaceable></option></term>
159
128
        <listitem>
160
 
          <synopsis><literal>servicename = </literal><replaceable
161
 
          >NAME</replaceable>
162
 
          </synopsis>
163
129
          <xi:include href="mandos-options.xml"
164
130
                      xpointer="servicename"/>
165
131
        </listitem>
166
132
      </varlistentry>
167
133
      
 
134
      <varlistentry>
 
135
        <term><option>use_dbus<literal> = </literal>{ <literal
 
136
          >1</literal> | <literal>yes</literal> | <literal
 
137
          >true</literal> | <literal>on</literal> | <literal
 
138
          >0</literal> | <literal>no</literal> | <literal
 
139
          >false</literal> | <literal>off</literal> }</option></term>
 
140
        <listitem>
 
141
          <xi:include href="mandos-options.xml" xpointer="dbus"/>
 
142
        </listitem>
 
143
      </varlistentry>
 
144
      
168
145
    </variablelist>
169
146
  </refsect1>
170
147
  
180
157
    <para>
181
158
      The <literal>[DEFAULT]</literal> is necessary because the Python
182
159
      built-in module <systemitem class="library">ConfigParser</systemitem>
183
 
      requres it.
 
160
      requires it.
184
161
    </para>
185
162
  </refsect1>
186
163
  
207
184
debug = true
208
185
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
209
186
servicename = Daena
 
187
use_dbus = False
210
188
      </programlisting>
211
189
    </informalexample>
212
190
  </refsect1>
221
199
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
222
200
      <manvolnum>5</manvolnum></citerefentry>
223
201
    </para>
224
 
 
 
202
    
225
203
    <variablelist>
226
204
      <varlistentry>
227
205
        <term>