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

  • Committer: Teddy Hogeborn
  • Date: 2016-03-08 00:03:43 UTC
  • Revision ID: teddy@recompile.se-20160308000343-kjoyixwksmboql1s
Server bug fix: Work around bug when stopping server

* init.d-mandos (do_stop): Work around SIGTERM ignoring bug by doing
  "mandos-ctl >/dev/null 2>&1" after sending signal.
* mandos.service (ExecStop): New; set to "/bin/kill -TERM $MAINPID ;
  /usr/sbin/mandos-ctl >/dev/null 2>&1" to work around SIGTERM
  ignoring bug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos-clients.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/clients.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2011-11-26">
 
6
<!ENTITY TIMESTAMP "2016-03-05">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
36
36
      <year>2009</year>
37
37
      <year>2010</year>
38
38
      <year>2011</year>
 
39
      <year>2012</year>
 
40
      <year>2013</year>
 
41
      <year>2014</year>
 
42
      <year>2015</year>
 
43
      <year>2016</year>
39
44
      <holder>Teddy Hogeborn</holder>
40
45
      <holder>Björn Påhlsson</holder>
41
46
    </copyright>
65
70
      ><refentrytitle>mandos</refentrytitle>
66
71
      <manvolnum>8</manvolnum></citerefentry>, read by it at startup.
67
72
      The file needs to list all clients that should be able to use
68
 
      the service.  All clients listed will be regarded as enabled,
69
 
      even if a client was disabled in a previous run of the server.
 
73
      the service.  The settings in this file can be overridden by
 
74
      runtime changes to the server, which it saves across restarts.
 
75
      (See the section called <quote>PERSISTENT STATE</quote> in
 
76
      <citerefentry><refentrytitle>mandos</refentrytitle><manvolnum
 
77
      >8</manvolnum></citerefentry>.)  However, any <emphasis
 
78
      >changes</emphasis> to this file (including adding and removing
 
79
      clients) will, at startup, override changes done during runtime.
70
80
    </para>
71
81
    <para>
72
82
      The format starts with a <literal>[<replaceable>section
111
121
          <para>
112
122
            How long to wait for external approval before resorting to
113
123
            use the <option>approved_by_default</option> value.  The
114
 
            default is <quote>0s</quote>, i.e. not to wait.
 
124
            default is <quote>PT0S</quote>, i.e. not to wait.
115
125
          </para>
116
126
          <para>
117
127
            The format of <replaceable>TIME</replaceable> is the same
161
171
            This option is <emphasis>optional</emphasis>.
162
172
          </para>
163
173
          <para>
164
 
            This option allows you to override the default shell
165
 
            command that the server will use to check if the client is
166
 
            still up.  Any output of the command will be ignored, only
167
 
            the exit code is checked:  If the exit code of the command
168
 
            is zero, the client is considered up.  The command will be
169
 
            run using <quote><command><filename>/bin/sh</filename>
 
174
            This option overrides the default shell command that the
 
175
            server will use to check if the client is still up.  Any
 
176
            output of the command will be ignored, only the exit code
 
177
            is checked:  If the exit code of the command is zero, the
 
178
            client is considered up.  The command will be run using
 
179
            <quote><command><filename>/bin/sh</filename>
170
180
            <option>-c</option></command></quote>, so
171
181
            <varname>PATH</varname> will be searched.  The default
172
182
            value for the checker command is <quote><literal
173
183
            ><command>fping</command> <option>-q</option> <option
174
 
            >--</option> %%(host)s</literal></quote>.
 
184
            >--</option> %%(host)s</literal></quote>.  Note that
 
185
            <command>mandos-keygen</command>, when generating output
 
186
            to be inserted into this file, normally looks for an SSH
 
187
            server on the Mandos client, and, if it find one, outputs
 
188
            a <option>checker</option> option to check for the
 
189
            client’s key fingerprint – this is more secure against
 
190
            spoofing.
175
191
          </para>
176
192
          <para>
177
193
            In addition to normal start time expansion, this option
329
345
            <option>extended_timeout</option> option.
330
346
          </para>
331
347
          <para>
332
 
            The <replaceable>TIME</replaceable> is specified as a
333
 
            space-separated number of values, each of which is a
334
 
            number and a one-character suffix.  The suffix must be one
335
 
            of <quote>d</quote>, <quote>s</quote>, <quote>m</quote>,
336
 
            <quote>h</quote>, and <quote>w</quote> for days, seconds,
337
 
            minutes, hours, and weeks, respectively.  The values are
338
 
            added together to give the total time value, so all of
339
 
            <quote><literal>330s</literal></quote>,
340
 
            <quote><literal>110s 110s 110s</literal></quote>, and
341
 
            <quote><literal>5m 30s</literal></quote> will give a value
342
 
            of five minutes and thirty seconds.
 
348
            The <replaceable>TIME</replaceable> is specified as an RFC
 
349
            3339 duration; for example
 
350
            <quote><literal>P1Y2M3DT4H5M6S</literal></quote> meaning
 
351
            one year, two months, three days, four hours, five
 
352
            minutes, and six seconds.  Some values can be omitted, see
 
353
            RFC 3339 Appendix A for details.
343
354
          </para>
344
355
        </listitem>
345
356
      </varlistentry>
403
414
        <quote><literal>approval_duration</literal></quote>,
404
415
        <quote><literal>created</literal></quote>,
405
416
        <quote><literal>enabled</literal></quote>,
 
417
        <quote><literal>expires</literal></quote>,
406
418
        <quote><literal>fingerprint</literal></quote>,
407
419
        <quote><literal>host</literal></quote>,
408
420
        <quote><literal>interval</literal></quote>,
451
463
      <literal>%(<replaceable>foo</replaceable>)s</literal> is
452
464
      obscure.
453
465
    </para>
 
466
    <xi:include href="bugs.xml"/>
454
467
  </refsect1>
455
468
  
456
469
  <refsect1 id="example">
458
471
    <informalexample>
459
472
      <programlisting>
460
473
[DEFAULT]
461
 
timeout = 5m
462
 
interval = 2m
 
474
timeout = PT5M
 
475
interval = PT2M
463
476
checker = fping -q -- %%(host)s
464
477
 
465
478
# Client "foo"
482
495
        4T2zw4dxS5NswXWU0sVEXxjs6PYxuIiCTL7vdpx8QjBkrPWDrAbcMyBr2O
483
496
        QlnHIvPzEArRQLo=
484
497
host = foo.example.org
485
 
interval = 1m
 
498
interval = PT1M
486
499
 
487
500
# Client "bar"
488
501
[bar]
489
502
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
490
503
secfile = /etc/mandos/bar-secret
491
 
timeout = 15m
 
504
timeout = PT15M
492
505
approved_by_default = False
493
 
approval_delay = 30s
 
506
approval_delay = PT30S
494
507
      </programlisting>
495
508
    </informalexample>
496
509
  </refsect1>
505
518
      <citerefentry><refentrytitle>mandos.conf</refentrytitle>
506
519
      <manvolnum>5</manvolnum></citerefentry>,
507
520
      <citerefentry><refentrytitle>mandos</refentrytitle>
 
521
      <manvolnum>8</manvolnum></citerefentry>,
 
522
      <citerefentry><refentrytitle>fping</refentrytitle>
508
523
      <manvolnum>8</manvolnum></citerefentry>
509
524
    </para>
 
525
    <variablelist>
 
526
      <varlistentry>
 
527
        <term>
 
528
          RFC 3339: <citetitle>Date and Time on the Internet:
 
529
          Timestamps</citetitle>
 
530
        </term>
 
531
      <listitem>
 
532
        <para>
 
533
          The time intervals are in the "duration" format, as
 
534
          specified in ABNF in Appendix A of RFC 3339.
 
535
        </para>
 
536
      </listitem>
 
537
      </varlistentry>
 
538
    </variablelist>
510
539
  </refsect1>
511
540
</refentry>
512
541
<!-- Local Variables: -->