/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

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
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-09-04">
 
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
40
    <xi:include href="legalnotice.xml"/>
39
41
  </refentryinfo>
40
 
 
 
42
  
41
43
  <refmeta>
42
44
    <refentrytitle>&CONFNAME;</refentrytitle>
43
45
    <manvolnum>5</manvolnum>
49
51
      Configuration file for the Mandos server
50
52
    </refpurpose>
51
53
  </refnamediv>
52
 
 
 
54
  
53
55
  <refsynopsisdiv>
54
56
    <synopsis>&CONFPATH;</synopsis>
55
57
  </refsynopsisdiv>
56
 
 
 
58
  
57
59
  <refsect1 id="description">
58
60
    <title>DESCRIPTION</title>
59
61
    <para>
71
73
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
72
74
      to provide comments.
73
75
    </para>
74
 
 
 
76
    
75
77
  </refsect1>
76
78
  <refsect1>
77
79
    <title>OPTIONS</title>
84
86
          <xi:include href="mandos-options.xml" xpointer="interface"/>
85
87
        </listitem>
86
88
      </varlistentry>
87
 
 
 
89
      
88
90
      <varlistentry>
89
91
        <term><option>address<literal> = </literal><replaceable
90
92
          >ADDRESS</replaceable></option></term>
92
94
          <xi:include href="mandos-options.xml" xpointer="address"/>
93
95
        </listitem>
94
96
      </varlistentry>
95
 
 
 
97
      
96
98
      <varlistentry>
97
99
        <term><option>port<literal> = </literal><replaceable
98
100
        >NUMBER</replaceable></option></term>
100
102
          <xi:include href="mandos-options.xml" xpointer="port"/>
101
103
        </listitem>
102
104
      </varlistentry>
103
 
 
 
105
      
104
106
      <varlistentry>
105
107
        <term><option>debug<literal> = </literal>{ <literal
106
108
          >1</literal> | <literal>yes</literal> | <literal
111
113
          <xi:include href="mandos-options.xml" xpointer="debug"/>
112
114
        </listitem>
113
115
      </varlistentry>
114
 
 
 
116
      
115
117
      <varlistentry>
116
118
        <term><option>priority<literal> = </literal><replaceable
117
119
        >STRING</replaceable></option></term>
119
121
          <xi:include href="mandos-options.xml" xpointer="priority"/>
120
122
        </listitem>
121
123
      </varlistentry>
122
 
 
 
124
      
123
125
      <varlistentry>
124
126
        <term><option>servicename<literal> = </literal
125
127
        ><replaceable>NAME</replaceable></option></term>
129
131
        </listitem>
130
132
      </varlistentry>
131
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
      
132
145
    </variablelist>
133
146
  </refsect1>
134
147
  
171
184
debug = true
172
185
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
173
186
servicename = Daena
 
187
use_dbus = False
174
188
      </programlisting>
175
189
    </informalexample>
176
190
  </refsect1>
185
199
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
186
200
      <manvolnum>5</manvolnum></citerefentry>
187
201
    </para>
188
 
 
 
202
    
189
203
    <variablelist>
190
204
      <varlistentry>
191
205
        <term>