/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: 2010-09-25 23:52:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925235217-4hhqfryz1ste6uw3
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
                                to "_" in D-Bus object paths.
  (MandosServer.handle_ipc): Bug fix: Send only address string to
                             D-Bus signal, not whole tuple.

* mandos-ctl: New options "--approve-by-default", "--deny-by-default",
              "--approval-delay", and "--approval-duration".
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new options.

* mandos-monitor (MandosClientWidget.update): Fix spelling.

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 "2011-11-26">
 
6
<!ENTITY TIMESTAMP "2009-02-25">
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>2011</year>
38
37
      <holder>Teddy Hogeborn</holder>
39
38
      <holder>Björn Påhlsson</holder>
40
39
    </copyright>
154
153
        </listitem>
155
154
      </varlistentry>
156
155
      
157
 
      <varlistentry>
158
 
        <term><option>restore<literal> = </literal>{ <literal
159
 
          >1</literal> | <literal>yes</literal> | <literal
160
 
          >true</literal> | <literal>on</literal> | <literal
161
 
          >0</literal> | <literal>no</literal> | <literal
162
 
          >false</literal> | <literal>off</literal> }</option></term>
163
 
        <listitem>
164
 
          <xi:include href="mandos-options.xml" xpointer="restore"/>
165
 
        </listitem>
166
 
      </varlistentry>
167
 
      
168
 
      <varlistentry>
169
 
        <term><option>statedir<literal> = </literal><replaceable
170
 
        >DIRECTORY</replaceable></option></term>
171
 
        <listitem>
172
 
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
173
 
        </listitem>
174
 
      </varlistentry>
175
 
      
176
156
    </variablelist>
177
157
  </refsect1>
178
158
  
217
197
servicename = Daena
218
198
use_dbus = False
219
199
use_ipv6 = True
220
 
restore = True
221
 
statedir = /var/lib/mandos
222
200
      </programlisting>
223
201
    </informalexample>
224
202
  </refsect1>
226
204
  <refsect1 id="see_also">
227
205
    <title>SEE ALSO</title>
228
206
    <para>
229
 
      <citerefentry><refentrytitle>intro</refentrytitle>
230
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
231
207
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
232
208
      ><manvolnum>3</manvolnum></citerefentry>,
233
209
      <citerefentry><refentrytitle>mandos</refentrytitle>