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

Hooks take new "modules" argument, and hook names can contain periods.

* debian/mandos-client.README.Debian: Adjust wording.
* debian/rules (binary-common): Exclude nework-hooks.d directory from
                                dh_fixperms.
* initramfs-tools-hook: Also create network hook directory.  Allow
                        periods in hook names.  Only run executable
                        files in hook directory.  Copy needed modules.
* network-hooks.d/bridge: Fix "/usr/bin/brctl" to "/usr/sbin/brctl".
                          Also take "modules" argument.
* plugins.d/mandos-client.xml (NETWORK HOOKS/REQUIREMENTS): Document
                                                            the
                                                            allowing
                                                            of periods
                                                            in hook
                                                            names.
  (NETWORK HOOKS/REQUIREMENTS/files): Adjust wording.
  (NETWORK HOOKS/REQUIREMENTS/modules): New.
  (NETWORK HOOKS/REQUIREMENTS/MANDOSNETHOOKDIR): Clarify.
  (NETWORK HOOKS/REQUIREMENTS/MODE): Add "modules".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl.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-ctl">
5
 
<!ENTITY TIMESTAMP "2017-02-23">
 
5
<!ENTITY TIMESTAMP "2011-10-03">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
33
33
    <copyright>
34
34
      <year>2010</year>
35
35
      <year>2011</year>
36
 
      <year>2012</year>
37
 
      <year>2013</year>
38
 
      <year>2014</year>
39
 
      <year>2015</year>
40
 
      <year>2016</year>
41
 
      <year>2017</year>
42
36
      <holder>Teddy Hogeborn</holder>
43
37
      <holder>Björn Påhlsson</holder>
44
38
    </copyright>
53
47
  <refnamediv>
54
48
    <refname><command>&COMMANDNAME;</command></refname>
55
49
    <refpurpose>
56
 
      Control or query the operation of the Mandos server
 
50
      Control the operation of the Mandos server
57
51
    </refpurpose>
58
52
  </refnamediv>
59
53
  
60
54
  <refsynopsisdiv>
61
55
    <cmdsynopsis>
62
56
      <command>&COMMANDNAME;</command>
63
 
      <group choice="req">
64
 
        <group>
65
 
          <arg choice="plain"><option>--enable</option></arg>
66
 
          <arg choice="plain"><option>-e</option></arg>
67
 
          <sbr/>
68
 
          <arg choice="plain"><option>--disable</option></arg>
69
 
          <arg choice="plain"><option>-d</option></arg>
70
 
        </group>
71
 
        <sbr/>
72
 
        <group>
73
 
          <arg choice="plain"><option>--bump-timeout</option></arg>
74
 
          <arg choice="plain"><option>-b</option></arg>
75
 
        </group>
76
 
        <sbr/>
77
 
        <group>
78
 
          <arg choice="plain"><option>--start-checker</option></arg>
79
 
        </group>
80
 
        <sbr/>
81
 
        <group>
82
 
          <arg choice="plain"><option>--stop-checker</option></arg>
83
 
        </group>
84
 
        <sbr/>
85
 
        <group>
86
 
          <arg choice="plain"><option>--remove</option></arg>
87
 
          <arg choice="plain"><option>-r</option></arg>
88
 
        </group>
89
 
        <sbr/>
90
 
        <group>
91
 
          <arg choice="plain"><option>--checker
92
 
          <replaceable>COMMAND</replaceable></option></arg>
93
 
          <arg choice="plain"><option>-c
94
 
          <replaceable>COMMAND</replaceable></option></arg>
95
 
        </group>
96
 
        <sbr/>
97
 
        <group>
98
 
          <arg choice="plain"><option>--timeout
99
 
          <replaceable>TIME</replaceable></option></arg>
100
 
          <arg choice="plain"><option>-t
101
 
          <replaceable>TIME</replaceable></option></arg>
102
 
        </group>
103
 
        <sbr/>
104
 
        <group>
105
 
          <arg choice="plain"><option>--extended-timeout
106
 
          <replaceable>TIME</replaceable></option></arg>
107
 
        </group>
108
 
        <sbr/>
109
 
        <group>
110
 
          <arg choice="plain"><option>--interval
111
 
          <replaceable>TIME</replaceable></option></arg>
112
 
          <arg choice="plain"><option>-i
113
 
          <replaceable>TIME</replaceable></option></arg>
114
 
        </group>
115
 
        <sbr/>
116
 
        <group>
117
 
          <arg choice="plain"><option>--approve-by-default</option
118
 
          ></arg>
119
 
          <sbr/>
120
 
          <arg choice="plain"><option>--deny-by-default</option></arg>
121
 
        </group>
122
 
        <sbr/>
123
 
        <group>
124
 
          <arg choice="plain"><option>--approval-delay
125
 
          <replaceable>TIME</replaceable></option></arg>
126
 
        </group>
127
 
        <sbr/>
128
 
        <group>
129
 
          <arg choice="plain"><option>--approval-duration
130
 
          <replaceable>TIME</replaceable></option></arg>
131
 
        </group>
132
 
        <sbr/>
133
 
        <group>
134
 
          <arg choice="plain"><option>--interval
135
 
          <replaceable>TIME</replaceable></option></arg>
136
 
          <arg choice="plain"><option>-i
137
 
          <replaceable>TIME</replaceable></option></arg>
138
 
        </group>
139
 
        <sbr/>
140
 
        <group>
141
 
          <arg choice="plain"><option>--host
142
 
          <replaceable>STRING</replaceable></option></arg>
143
 
          <arg choice="plain"><option>-H
144
 
          <replaceable>STRING</replaceable></option></arg>
145
 
        </group>
146
 
        <sbr/>
147
 
        <group>
148
 
          <arg choice="plain"><option>--secret
149
 
          <replaceable>FILENAME</replaceable></option></arg>
150
 
          <arg choice="plain"><option>-s
151
 
          <replaceable>FILENAME</replaceable></option></arg>
152
 
        </group>
153
 
        <sbr/>
154
 
        <group>
155
 
          <arg choice="plain"><option>--approve</option></arg>
156
 
          <arg choice="plain"><option>-A</option></arg>
157
 
          <sbr/>
158
 
          <arg choice="plain"><option>--deny</option></arg>
159
 
          <arg choice="plain"><option>-D</option></arg>
160
 
        </group>
 
57
      <group>
 
58
        <arg choice="plain"><option>--enable</option></arg>
 
59
        <arg choice="plain"><option>-e</option></arg>
 
60
        <sbr/>
 
61
        <arg choice="plain"><option>--disable</option></arg>
 
62
        <arg choice="plain"><option>-d</option></arg>
 
63
      </group>
 
64
      <sbr/>
 
65
      <group>
 
66
        <arg choice="plain"><option>--bump-timeout</option></arg>
 
67
        <arg choice="plain"><option>-b</option></arg>
 
68
      </group>
 
69
      <sbr/>
 
70
      <group>
 
71
        <arg choice="plain"><option>--start-checker</option></arg>
 
72
      </group>
 
73
      <sbr/>
 
74
      <group>
 
75
        <arg choice="plain"><option>--stop-checker</option></arg>
 
76
      </group>
 
77
      <sbr/>
 
78
      <group>
 
79
        <arg choice="plain"><option>--remove</option></arg>
 
80
        <arg choice="plain"><option>-r</option></arg>
 
81
      </group>
 
82
      <sbr/>
 
83
      <group>
 
84
        <arg choice="plain"><option>--checker
 
85
        <replaceable>COMMAND</replaceable></option></arg>
 
86
        <arg choice="plain"><option>-c
 
87
        <replaceable>COMMAND</replaceable></option></arg>
 
88
      </group>
 
89
      <sbr/>
 
90
      <group>
 
91
        <arg choice="plain"><option>--timeout
 
92
        <replaceable>TIME</replaceable></option></arg>
 
93
        <arg choice="plain"><option>-t
 
94
        <replaceable>TIME</replaceable></option></arg>
 
95
      </group>
 
96
      <sbr/>
 
97
      <group>
 
98
        <arg choice="plain"><option>--extended-timeout
 
99
        <replaceable>TIME</replaceable></option></arg>
 
100
      </group>
 
101
      <sbr/>
 
102
      <group>
 
103
        <arg choice="plain"><option>--interval
 
104
        <replaceable>TIME</replaceable></option></arg>
 
105
        <arg choice="plain"><option>-i
 
106
        <replaceable>TIME</replaceable></option></arg>
 
107
      </group>
 
108
      <sbr/>
 
109
      <group>
 
110
        <arg choice="plain"><option>--approve-by-default</option
 
111
        ></arg>
 
112
        <sbr/>
 
113
        <arg choice="plain"><option>--deny-by-default</option></arg>
 
114
      </group>
 
115
      <sbr/>
 
116
      <group>
 
117
        <arg choice="plain"><option>--approval-delay
 
118
        <replaceable>TIME</replaceable></option></arg>
 
119
      </group>
 
120
      <sbr/>
 
121
      <group>
 
122
        <arg choice="plain"><option>--approval-duration
 
123
        <replaceable>TIME</replaceable></option></arg>
 
124
      </group>
 
125
      <sbr/>
 
126
      <group>
 
127
        <arg choice="plain"><option>--interval
 
128
        <replaceable>TIME</replaceable></option></arg>
 
129
        <arg choice="plain"><option>-i
 
130
        <replaceable>TIME</replaceable></option></arg>
 
131
      </group>
 
132
      <sbr/>
 
133
      <group>
 
134
        <arg choice="plain"><option>--host
 
135
        <replaceable>STRING</replaceable></option></arg>
 
136
        <arg choice="plain"><option>-H
 
137
        <replaceable>STRING</replaceable></option></arg>
 
138
      </group>
 
139
      <sbr/>
 
140
      <group>
 
141
        <arg choice="plain"><option>--secret
 
142
        <replaceable>FILENAME</replaceable></option></arg>
 
143
        <arg choice="plain"><option>-s
 
144
        <replaceable>FILENAME</replaceable></option></arg>
 
145
      </group>
 
146
      <sbr/>
 
147
      <group>
 
148
        <arg choice="plain"><option>--approve</option></arg>
 
149
        <arg choice="plain"><option>-A</option></arg>
 
150
        <sbr/>
 
151
        <arg choice="plain"><option>--deny</option></arg>
 
152
        <arg choice="plain"><option>-D</option></arg>
161
153
      </group>
162
154
      <sbr/>
163
155
      <group choice="req">
171
163
    <cmdsynopsis>
172
164
      <command>&COMMANDNAME;</command>
173
165
      <group>
174
 
          <arg choice="plain"><option>--verbose</option></arg>
175
 
          <arg choice="plain"><option>-v</option></arg>
176
 
          <sbr/>
177
 
          <arg choice="plain"><option>--dump-json</option></arg>
178
 
          <arg choice="plain"><option>-j</option></arg>
 
166
        <arg choice="plain"><option>--verbose</option></arg>
 
167
        <arg choice="plain"><option>-v</option></arg>
179
168
      </group>
180
169
      <group>
181
170
        <arg rep='repeat' choice='plain'>
205
194
        <arg choice="plain"><option>-v</option></arg>
206
195
      </group>
207
196
    </cmdsynopsis>
208
 
    <cmdsynopsis>
209
 
      <command>&COMMANDNAME;</command>
210
 
      <arg choice="plain"><option>--check</option></arg>
211
 
    </cmdsynopsis>
212
197
  </refsynopsisdiv>
213
198
  
214
199
  <refsect1 id="description">
215
200
    <title>DESCRIPTION</title>
216
201
    <para>
217
 
      <command>&COMMANDNAME;</command> is a program to control or
218
 
      query the operation of the Mandos server
219
 
      <citerefentry><refentrytitle>mandos</refentrytitle><manvolnum
220
 
      >8</manvolnum></citerefentry>.
 
202
      <command>&COMMANDNAME;</command> is a program to control the
 
203
      operation of the Mandos server <citerefentry><refentrytitle
 
204
      >mandos</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
221
205
    </para>
222
206
    <para>
223
207
      This program can be used to change client settings, approve or
481
465
      </varlistentry>
482
466
      
483
467
      <varlistentry>
484
 
        <term><option>--dump-json</option></term>
485
 
        <term><option>-j</option></term>
486
 
        <listitem>
487
 
          <para>
488
 
            Dump client settings as JSON to standard output.
489
 
          </para>
490
 
        </listitem>
491
 
      </varlistentry>
492
 
      
493
 
      <varlistentry>
494
468
        <term><option>--is-enabled</option></term>
495
469
        <term><option>-V</option></term>
496
470
        <listitem>
501
475
        </listitem>
502
476
      </varlistentry>
503
477
      
504
 
      <varlistentry>
505
 
        <term><option>--check</option></term>
506
 
        <listitem>
507
 
          <para>
508
 
            Run self-tests.  This includes any unit tests, etc.
509
 
          </para>
510
 
        </listitem>
511
 
      </varlistentry>
512
 
      
513
478
    </variablelist>
514
479
  </refsect1>
515
480
  
531
496
    </para>
532
497
  </refsect1>
533
498
  
534
 
  <refsect1 id="bugs">
535
 
    <title>BUGS</title>
536
 
    <xi:include href="bugs.xml"/>
537
 
  </refsect1>
 
499
<!--   <refsect1 id="bugs"> -->
 
500
<!--     <title>BUGS</title> -->
 
501
<!--     <para> -->
 
502
<!--     </para> -->
 
503
<!--   </refsect1> -->
538
504
  
539
505
  <refsect1 id="example">
540
506
    <title>EXAMPLE</title>