/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: 2011-12-03 01:04:54 UTC
  • Revision ID: teddy@recompile.se-20111203010454-9g5cyo2x7xwnacc5
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration,
  ClientDBus.timeout, ClientDBus.extended_timeout,
  ClientDBus.interval): Bug fix: Cast to correct D-Bus type.
* mandos-ctl (string_to_delta): Interpret unadorned numbers as
                                milliseconds.

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 "2013-10-20">
 
6
<!ENTITY TIMESTAMP "2011-10-03">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
35
35
      <year>2008</year>
36
36
      <year>2009</year>
37
37
      <year>2011</year>
38
 
      <year>2012</year>
39
 
      <year>2013</year>
40
38
      <holder>Teddy Hogeborn</holder>
41
39
      <holder>Björn Påhlsson</holder>
42
40
    </copyright>
156
154
        </listitem>
157
155
      </varlistentry>
158
156
      
159
 
      <varlistentry>
160
 
        <term><option>restore<literal> = </literal>{ <literal
161
 
          >1</literal> | <literal>yes</literal> | <literal
162
 
          >true</literal> | <literal>on</literal> | <literal
163
 
          >0</literal> | <literal>no</literal> | <literal
164
 
          >false</literal> | <literal>off</literal> }</option></term>
165
 
        <listitem>
166
 
          <xi:include href="mandos-options.xml" xpointer="restore"/>
167
 
        </listitem>
168
 
      </varlistentry>
169
 
      
170
 
      <varlistentry>
171
 
        <term><option>statedir<literal> = </literal><replaceable
172
 
        >DIRECTORY</replaceable></option></term>
173
 
        <listitem>
174
 
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
175
 
        </listitem>
176
 
      </varlistentry>
177
 
      
178
 
      <varlistentry>
179
 
        <term><option>socket<literal> = </literal><replaceable
180
 
        >NUMBER</replaceable></option></term>
181
 
        <listitem>
182
 
          <xi:include href="mandos-options.xml" xpointer="socket"/>
183
 
        </listitem>
184
 
      </varlistentry>
185
 
      
186
157
    </variablelist>
187
158
  </refsect1>
188
159
  
227
198
servicename = Daena
228
199
use_dbus = False
229
200
use_ipv6 = True
230
 
restore = True
231
 
statedir = /var/lib/mandos
232
201
      </programlisting>
233
202
    </informalexample>
234
203
  </refsect1>