/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: 2008-09-03 05:04:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080903050440-7cwzxestx6pvdy1i
* Makefile (mandos.8): Add dependency on "overview.xml" and
                       "legalnotice.xml".
  (mandos-keygen.8): New target.
  (mandos-conf.5): Added dependency on "legalnotice.xml".
  (plugin-runner.8mandos): New target
  (plugins.d/password-request.8mandos): - '' -

* mandos-options.xml (priority): Make wording server/client neutral.

* plugins.d/password-request.c (main): Changed .arg fields of the argp
                                       options struct to be more
                                       consistent with the manual.

* plugins.d/password-request.xml (OVERVIEW): Moved to after "OPTIONS".
  (OPTIONS): Improved wording and names of replaceables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
1
1
<?xml version="1.0" encoding="UTF-8"?>
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
<!ENTITY VERSION "1.0">
4
5
<!ENTITY CONFNAME "mandos.conf">
5
6
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2008-12-28">
7
 
<!ENTITY % common SYSTEM "common.ent">
8
 
%common;
 
7
<!ENTITY TIMESTAMP "2008-08-31">
9
8
]>
10
9
 
11
10
<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
13
12
    <title>Mandos Manual</title>
14
13
    <!-- NWalsh’s docbook scripts use this to generate the footer: -->
15
14
    <productname>Mandos</productname>
16
 
    <productnumber>&version;</productnumber>
 
15
    <productnumber>&VERSION;</productnumber>
17
16
    <date>&TIMESTAMP;</date>
18
17
    <authorgroup>
19
18
      <author>
38
37
    </copyright>
39
38
    <xi:include href="legalnotice.xml"/>
40
39
  </refentryinfo>
41
 
  
 
40
 
42
41
  <refmeta>
43
42
    <refentrytitle>&CONFNAME;</refentrytitle>
44
43
    <manvolnum>5</manvolnum>
50
49
      Configuration file for the Mandos server
51
50
    </refpurpose>
52
51
  </refnamediv>
53
 
  
 
52
 
54
53
  <refsynopsisdiv>
55
54
    <synopsis>&CONFPATH;</synopsis>
56
55
  </refsynopsisdiv>
57
 
  
 
56
 
58
57
  <refsect1 id="description">
59
58
    <title>DESCRIPTION</title>
60
59
    <para>
72
71
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
73
72
      to provide comments.
74
73
    </para>
75
 
    
 
74
 
76
75
  </refsect1>
77
76
  <refsect1>
78
77
    <title>OPTIONS</title>
85
84
          <xi:include href="mandos-options.xml" xpointer="interface"/>
86
85
        </listitem>
87
86
      </varlistentry>
88
 
      
 
87
 
89
88
      <varlistentry>
90
89
        <term><option>address<literal> = </literal><replaceable
91
90
          >ADDRESS</replaceable></option></term>
93
92
          <xi:include href="mandos-options.xml" xpointer="address"/>
94
93
        </listitem>
95
94
      </varlistentry>
96
 
      
 
95
 
97
96
      <varlistentry>
98
97
        <term><option>port<literal> = </literal><replaceable
99
98
        >NUMBER</replaceable></option></term>
101
100
          <xi:include href="mandos-options.xml" xpointer="port"/>
102
101
        </listitem>
103
102
      </varlistentry>
104
 
      
 
103
 
105
104
      <varlistentry>
106
105
        <term><option>debug<literal> = </literal>{ <literal
107
106
          >1</literal> | <literal>yes</literal> | <literal
112
111
          <xi:include href="mandos-options.xml" xpointer="debug"/>
113
112
        </listitem>
114
113
      </varlistentry>
115
 
      
 
114
 
116
115
      <varlistentry>
117
116
        <term><option>priority<literal> = </literal><replaceable
118
117
        >STRING</replaceable></option></term>
120
119
          <xi:include href="mandos-options.xml" xpointer="priority"/>
121
120
        </listitem>
122
121
      </varlistentry>
123
 
      
 
122
 
124
123
      <varlistentry>
125
124
        <term><option>servicename<literal> = </literal
126
125
        ><replaceable>NAME</replaceable></option></term>
130
129
        </listitem>
131
130
      </varlistentry>
132
131
      
133
 
      <varlistentry>
134
 
        <term><option>use_dbus<literal> = </literal>{ <literal
135
 
          >1</literal> | <literal>yes</literal> | <literal
136
 
          >true</literal> | <literal>on</literal> | <literal
137
 
          >0</literal> | <literal>no</literal> | <literal
138
 
          >false</literal> | <literal>off</literal> }</option></term>
139
 
        <listitem>
140
 
          <xi:include href="mandos-options.xml" xpointer="dbus"/>
141
 
        </listitem>
142
 
      </varlistentry>
143
 
      
144
132
    </variablelist>
145
133
  </refsect1>
146
134
  
156
144
    <para>
157
145
      The <literal>[DEFAULT]</literal> is necessary because the Python
158
146
      built-in module <systemitem class="library">ConfigParser</systemitem>
159
 
      requires it.
 
147
      requres it.
160
148
    </para>
161
149
  </refsect1>
162
150
  
183
171
debug = true
184
172
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
185
173
servicename = Daena
186
 
use_dbus = False
187
174
      </programlisting>
188
175
    </informalexample>
189
176
  </refsect1>
198
185
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
199
186
      <manvolnum>5</manvolnum></citerefentry>
200
187
    </para>
201
 
    
 
188
 
202
189
    <variablelist>
203
190
      <varlistentry>
204
191
        <term>