/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

* mandos (Client.checked_ok): Set "expires" after setting timeout.
  (MultiprocessingMixIn.process_request): Return process object.
  (MultiprocessingMixInWithPipe.process_request): Receive proc object
                                                  and pass it to
                                                  add_pipe.  Do not
                                                  use super().
  (MultiprocessingMixInWithPipe.add_pipe): Take "proc" argument.  All
                                           callers changed.
  (MandosServer.add_pipe): Take "proc" argument.  All callers changed.
  (MandosServer.handle_ipc): Take "proc" argument.  All callers
                             changed.  Wait for process completion
                             when pipe closes.
  (main/cleanup): Remove any zombies.

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 "2016-02-28">
 
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
38
      <holder>Teddy Hogeborn</holder>
45
39
      <holder>Björn Påhlsson</holder>
46
40
    </copyright>
160
154
        </listitem>
161
155
      </varlistentry>
162
156
      
163
 
      <varlistentry>
164
 
        <term><option>restore<literal> = </literal>{ <literal
165
 
          >1</literal> | <literal>yes</literal> | <literal
166
 
          >true</literal> | <literal>on</literal> | <literal
167
 
          >0</literal> | <literal>no</literal> | <literal
168
 
          >false</literal> | <literal>off</literal> }</option></term>
169
 
        <listitem>
170
 
          <xi:include href="mandos-options.xml" xpointer="restore"/>
171
 
        </listitem>
172
 
      </varlistentry>
173
 
      
174
 
      <varlistentry>
175
 
        <term><option>statedir<literal> = </literal><replaceable
176
 
        >DIRECTORY</replaceable></option></term>
177
 
        <listitem>
178
 
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
179
 
        </listitem>
180
 
      </varlistentry>
181
 
      
182
 
      <varlistentry>
183
 
        <term><option>socket<literal> = </literal><replaceable
184
 
        >NUMBER</replaceable></option></term>
185
 
        <listitem>
186
 
          <xi:include href="mandos-options.xml" xpointer="socket"/>
187
 
        </listitem>
188
 
      </varlistentry>
189
 
      
190
157
    </variablelist>
191
158
  </refsect1>
192
159
  
226
193
interface = eth0
227
194
address = fe80::aede:48ff:fe71:f6f2
228
195
port = 1025
229
 
debug = True
230
 
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA
 
196
debug = true
 
197
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
231
198
servicename = Daena
232
199
use_dbus = False
233
200
use_ipv6 = True
234
 
restore = True
235
 
statedir = /var/lib/mandos
236
201
      </programlisting>
237
202
    </informalexample>
238
203
  </refsect1>