/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.xml

* mandos (Client.runtime_expansions): Add "expires" and (bug fix)
                                      "last_approval_request".
  (main): Don't ignore SIGINT.
* mandos-clients.conf.xml (RUNTIME EXPANSION): Added "expires".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.xml
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
4
<!ENTITY COMMANDNAME "mandos">
5
 
<!ENTITY TIMESTAMP "2013-10-26">
 
5
<!ENTITY TIMESTAMP "2012-01-15">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
36
36
      <year>2010</year>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
39
 
      <year>2013</year>
40
39
      <holder>Teddy Hogeborn</holder>
41
40
      <holder>Björn Påhlsson</holder>
42
41
    </copyright>
101
100
      <sbr/>
102
101
      <arg><option>--statedir
103
102
      <replaceable>DIRECTORY</replaceable></option></arg>
104
 
      <sbr/>
105
 
      <arg><option>--socket
106
 
      <replaceable>FD</replaceable></option></arg>
107
 
      <sbr/>
108
 
      <arg><option>--foreground</option></arg>
109
103
    </cmdsynopsis>
110
104
    <cmdsynopsis>
111
105
      <command>&COMMANDNAME;</command>
234
228
        <term><option>--priority <replaceable>
235
229
        PRIORITY</replaceable></option></term>
236
230
        <listitem>
237
 
          <xi:include href="mandos-options.xml"
238
 
                      xpointer="priority_compat"/>
 
231
          <xi:include href="mandos-options.xml" xpointer="priority"/>
239
232
        </listitem>
240
233
      </varlistentry>
241
234
      
306
299
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
307
300
        </listitem>
308
301
      </varlistentry>
309
 
      
310
 
      <varlistentry>
311
 
        <term><option>--socket
312
 
        <replaceable>FD</replaceable></option></term>
313
 
        <listitem>
314
 
          <xi:include href="mandos-options.xml" xpointer="socket"/>
315
 
        </listitem>
316
 
      </varlistentry>
317
 
      
318
 
      <varlistentry>
319
 
        <term><option>--foreground</option></term>
320
 
        <listitem>
321
 
          <xi:include href="mandos-options.xml"
322
 
                      xpointer="foreground"/>
323
 
        </listitem>
324
 
      </varlistentry>
325
 
      
326
302
    </variablelist>
327
303
  </refsect1>
328
304
  
518
494
        </listitem>
519
495
      </varlistentry>
520
496
      <varlistentry>
521
 
        <term><filename>/run/mandos.pid</filename></term>
 
497
        <term><filename>/var/run/mandos.pid</filename></term>
522
498
        <listitem>
523
499
          <para>
524
500
            The file containing the process id of the
525
501
            <command>&COMMANDNAME;</command> process started last.
526
 
            <emphasis >Note:</emphasis> If the <filename
527
 
            class="directory">/run</filename> directory does not
528
 
            exist, <filename>/var/run/mandos.pid</filename> will be
529
 
            used instead.
530
502
          </para>
531
503
        </listitem>
532
504
      </varlistentry>
577
549
      There is no fine-grained control over logging and debug output.
578
550
    </para>
579
551
    <para>
 
552
      Debug mode is conflated with running in the foreground.
 
553
    </para>
 
554
    <para>
580
555
      This server does not check the expire time of clients’ OpenPGP
581
556
      keys.
582
557
    </para>