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

  • Committer: Teddy Hogeborn
  • Date: 2024-09-08 17:17:22 UTC
  • Revision ID: teddy@recompile.se-20240908171722-oqkqtp0zto6ze2m6
Do not hardcode directory names; get them from pkg-config

Similarly to the directory for systemd unit files (output of
"pkg-config systemd --variable=systemdsystemunitdir"), the values of
the "tmpfilesdir" and "sysusersdir" variables should not be hardcoded
in debian/mandos.dirs and debian/mandos-client.dirs.  Fix this the
same way as with systemdsystemunitdir; i.e. remove the directories
from the .dirs files, and instead create the directories in override
rules in debian/rules.

* debian/mandos-client.dirs (usr/lib/sysusers.d): Removed.
* debian/mandos.dirs (usr/lib/tmpfiles.d, usr/lib/sysusers.d):
  Removed.
* debian/rules (override_dh_installdirs-indep): Also create
  directories for the "tmpfilesdir" and "sysusersdir" variables from
  pkg-config.
  (override_dh_installdirs-arch): New; create directory for the
  "sysusersdir" variable from pkg-config.

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 "2019-02-10">
 
5
<!ENTITY TIMESTAMP "2019-07-29">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
62
62
  <refsynopsisdiv>
63
63
    <cmdsynopsis>
64
64
      <command>&COMMANDNAME;</command>
 
65
      <group>
 
66
          <arg choice="plain"><option>--verbose</option></arg>
 
67
          <arg choice="plain"><option>-v</option></arg>
 
68
          <sbr/>
 
69
          <arg choice="plain"><option>--dump-json</option></arg>
 
70
          <arg choice="plain"><option>-j</option></arg>
 
71
      </group>
 
72
      <arg><option>--debug</option></arg>
 
73
      <group>
 
74
        <arg rep='repeat' choice='plain'>
 
75
          <replaceable>CLIENT</replaceable>
 
76
        </arg>
 
77
      </group>
 
78
    </cmdsynopsis>
 
79
    <cmdsynopsis>
 
80
      <command>&COMMANDNAME;</command>
65
81
      <group choice="req">
66
82
        <group>
67
83
          <arg choice="plain"><option>--enable</option></arg>
78
94
        <sbr/>
79
95
        <group>
80
96
          <arg choice="plain"><option>--start-checker</option></arg>
81
 
        </group>
82
 
        <sbr/>
83
 
        <group>
84
97
          <arg choice="plain"><option>--stop-checker</option></arg>
85
98
        </group>
86
99
        <sbr/>
87
100
        <group>
88
 
          <arg choice="plain"><option>--remove</option></arg>
89
 
          <arg choice="plain"><option>-r</option></arg>
90
 
        </group>
91
 
        <sbr/>
92
 
        <group>
93
101
          <arg choice="plain"><option>--checker
94
102
          <replaceable>COMMAND</replaceable></option></arg>
95
103
          <arg choice="plain"><option>-c
133
141
        </group>
134
142
        <sbr/>
135
143
        <group>
136
 
          <arg choice="plain"><option>--interval
137
 
          <replaceable>TIME</replaceable></option></arg>
138
 
          <arg choice="plain"><option>-i
139
 
          <replaceable>TIME</replaceable></option></arg>
140
 
        </group>
141
 
        <sbr/>
142
 
        <group>
143
144
          <arg choice="plain"><option>--host
144
145
          <replaceable>STRING</replaceable></option></arg>
145
146
          <arg choice="plain"><option>-H
162
163
        </group>
163
164
      </group>
164
165
      <sbr/>
 
166
      <arg><option>--debug</option></arg>
165
167
      <group choice="req">
166
168
        <arg choice="plain"><option>--all</option></arg>
167
169
        <arg choice="plain"><option>-a</option></arg>
173
175
    <cmdsynopsis>
174
176
      <command>&COMMANDNAME;</command>
175
177
      <group>
176
 
          <arg choice="plain"><option>--verbose</option></arg>
177
 
          <arg choice="plain"><option>-v</option></arg>
178
 
          <sbr/>
179
 
          <arg choice="plain"><option>--dump-json</option></arg>
180
 
          <arg choice="plain"><option>-j</option></arg>
181
 
      </group>
182
 
      <group>
 
178
        <arg choice="plain"><option>--deny</option></arg>
 
179
        <arg choice="plain"><option>-D</option></arg>
 
180
      </group>
 
181
      <group choice="req">
 
182
          <arg choice="plain"><option>--remove</option></arg>
 
183
          <arg choice="plain"><option>-r</option></arg>
 
184
      </group>
 
185
      <sbr/>
 
186
      <arg><option>--debug</option></arg>
 
187
      <group choice="req">
 
188
        <arg choice="plain"><option>--all</option></arg>
 
189
        <arg choice="plain"><option>-a</option></arg>
183
190
        <arg rep='repeat' choice='plain'>
184
191
          <replaceable>CLIENT</replaceable>
185
192
        </arg>
191
198
        <arg choice="plain"><option>--is-enabled</option></arg>
192
199
        <arg choice="plain"><option>-V</option></arg>
193
200
      </group>
 
201
      <arg><option>--debug</option></arg>
194
202
      <arg choice='plain'><replaceable>CLIENT</replaceable></arg>
195
203
    </cmdsynopsis>
196
204
    <cmdsynopsis>
504
512
      </varlistentry>
505
513
      
506
514
      <varlistentry>
 
515
        <term><option>--debug</option></term>
 
516
        <listitem>
 
517
          <para>
 
518
            Show debug output; currently, this means show D-Bus calls.
 
519
          </para>
 
520
        </listitem>
 
521
      </varlistentry>
 
522
      
 
523
      <varlistentry>
507
524
        <term><option>--check</option></term>
508
525
        <listitem>
509
526
          <para>
540
557
  
541
558
  <refsect1 id="example">
542
559
    <title>EXAMPLE</title>
 
560
    <!-- Name of test methods in class Test_commands_from_options are
 
561
         written in comments below.  When adding an example, add a
 
562
         test too which tests the documented behavior. -->
543
563
    <informalexample>
 
564
      <!-- Test method: test_manual_page_example_1() -->
544
565
      <para>
545
566
        To list all clients:
546
567
      </para>
550
571
    </informalexample>
551
572
    
552
573
    <informalexample>
 
574
      <!-- Test method: test_manual_page_example_2() -->
553
575
      <para>
554
576
        To list <emphasis>all</emphasis> settings for the clients
555
577
        named <quote>foo1.example.org</quote> and <quote
564
586
    </informalexample>
565
587
    
566
588
    <informalexample>
 
589
      <!-- Test method: test_manual_page_example_3() -->
567
590
      <para>
568
591
        To enable all clients:
569
592
      </para>
573
596
    </informalexample>
574
597
    
575
598
    <informalexample>
 
599
      <!-- Test method: test_manual_page_example_4() -->
576
600
      <para>
577
601
        To change timeout and interval value for the clients
578
602
        named <quote>foo1.example.org</quote> and <quote
581
605
      <para>
582
606
 
583
607
<!-- do not wrap this line -->
584
 
<userinput>&COMMANDNAME; --timeout="5m" --interval="1m" foo1.example.org foo2.example.org</userinput>
 
608
<userinput>&COMMANDNAME; --timeout=PT5M --interval=PT1M foo1.example.org foo2.example.org</userinput>
585
609
 
586
610
      </para>
587
611
    </informalexample>
588
612
    
589
613
    <informalexample>
 
614
      <!-- Test method: test_manual_page_example_5() -->
590
615
      <para>
591
 
        To approve all clients currently waiting for it:
 
616
        To approve all clients currently waiting for approval:
592
617
      </para>
593
618
      <para>
594
619
        <userinput>&COMMANDNAME; --approve --all</userinput>