/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

Hooks take new "modules" argument, and hook names can contain periods.

* debian/mandos-client.README.Debian: Adjust wording.
* debian/rules (binary-common): Exclude nework-hooks.d directory from
                                dh_fixperms.
* initramfs-tools-hook: Also create network hook directory.  Allow
                        periods in hook names.  Only run executable
                        files in hook directory.  Copy needed modules.
* network-hooks.d/bridge: Fix "/usr/bin/brctl" to "/usr/sbin/brctl".
                          Also take "modules" argument.
* plugins.d/mandos-client.xml (NETWORK HOOKS/REQUIREMENTS): Document
                                                            the
                                                            allowing
                                                            of periods
                                                            in hook
                                                            names.
  (NETWORK HOOKS/REQUIREMENTS/files): Adjust wording.
  (NETWORK HOOKS/REQUIREMENTS/modules): New.
  (NETWORK HOOKS/REQUIREMENTS/MANDOSNETHOOKDIR): Clarify.
  (NETWORK HOOKS/REQUIREMENTS/MODE): Add "modules".

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 "2018-02-08">
 
6
<!ENTITY TIMESTAMP "2011-10-03">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
34
34
    <copyright>
35
35
      <year>2008</year>
36
36
      <year>2009</year>
37
 
      <year>2010</year>
38
37
      <year>2011</year>
39
 
      <year>2012</year>
40
 
      <year>2013</year>
41
 
      <year>2014</year>
42
 
      <year>2015</year>
43
 
      <year>2016</year>
44
 
      <year>2017</year>
45
 
      <year>2018</year>
46
38
      <holder>Teddy Hogeborn</holder>
47
39
      <holder>Björn Påhlsson</holder>
48
40
    </copyright>
162
154
        </listitem>
163
155
      </varlistentry>
164
156
      
165
 
      <varlistentry>
166
 
        <term><option>restore<literal> = </literal>{ <literal
167
 
          >1</literal> | <literal>yes</literal> | <literal
168
 
          >true</literal> | <literal>on</literal> | <literal
169
 
          >0</literal> | <literal>no</literal> | <literal
170
 
          >false</literal> | <literal>off</literal> }</option></term>
171
 
        <listitem>
172
 
          <xi:include href="mandos-options.xml" xpointer="restore"/>
173
 
        </listitem>
174
 
      </varlistentry>
175
 
      
176
 
      <varlistentry>
177
 
        <term><option>statedir<literal> = </literal><replaceable
178
 
        >DIRECTORY</replaceable></option></term>
179
 
        <listitem>
180
 
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
181
 
        </listitem>
182
 
      </varlistentry>
183
 
      
184
 
      <varlistentry>
185
 
        <term><option>socket<literal> = </literal><replaceable
186
 
        >NUMBER</replaceable></option></term>
187
 
        <listitem>
188
 
          <xi:include href="mandos-options.xml" xpointer="socket"/>
189
 
        </listitem>
190
 
      </varlistentry>
191
 
      
192
157
    </variablelist>
193
158
  </refsect1>
194
159
  
206
171
      built-in module <systemitem class="library">ConfigParser</systemitem>
207
172
      requires it.
208
173
    </para>
209
 
    <xi:include href="bugs.xml"/>
210
174
  </refsect1>
211
175
  
212
176
  <refsect1 id="example">
229
193
interface = eth0
230
194
address = fe80::aede:48ff:fe71:f6f2
231
195
port = 1025
232
 
debug = True
233
 
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA
 
196
debug = true
 
197
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
234
198
servicename = Daena
235
199
use_dbus = False
236
200
use_ipv6 = True
237
 
restore = True
238
 
statedir = /var/lib/mandos
239
201
      </programlisting>
240
202
    </informalexample>
241
203
  </refsect1>