/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 "2009-01-04">
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>
33
32
    </authorgroup>
34
33
    <copyright>
35
34
      <year>2008</year>
36
 
      <year>2009</year>
37
35
      <holder>Teddy Hogeborn</holder>
38
36
      <holder>Björn Påhlsson</holder>
39
37
    </copyright>
40
38
    <xi:include href="legalnotice.xml"/>
41
39
  </refentryinfo>
42
 
  
 
40
 
43
41
  <refmeta>
44
42
    <refentrytitle>&CONFNAME;</refentrytitle>
45
43
    <manvolnum>5</manvolnum>
51
49
      Configuration file for the Mandos server
52
50
    </refpurpose>
53
51
  </refnamediv>
54
 
  
 
52
 
55
53
  <refsynopsisdiv>
56
54
    <synopsis>&CONFPATH;</synopsis>
57
55
  </refsynopsisdiv>
58
 
  
 
56
 
59
57
  <refsect1 id="description">
60
58
    <title>DESCRIPTION</title>
61
59
    <para>
73
71
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
74
72
      to provide comments.
75
73
    </para>
76
 
    
 
74
 
77
75
  </refsect1>
78
76
  <refsect1>
79
77
    <title>OPTIONS</title>
86
84
          <xi:include href="mandos-options.xml" xpointer="interface"/>
87
85
        </listitem>
88
86
      </varlistentry>
89
 
      
 
87
 
90
88
      <varlistentry>
91
89
        <term><option>address<literal> = </literal><replaceable
92
90
          >ADDRESS</replaceable></option></term>
94
92
          <xi:include href="mandos-options.xml" xpointer="address"/>
95
93
        </listitem>
96
94
      </varlistentry>
97
 
      
 
95
 
98
96
      <varlistentry>
99
97
        <term><option>port<literal> = </literal><replaceable
100
98
        >NUMBER</replaceable></option></term>
102
100
          <xi:include href="mandos-options.xml" xpointer="port"/>
103
101
        </listitem>
104
102
      </varlistentry>
105
 
      
 
103
 
106
104
      <varlistentry>
107
105
        <term><option>debug<literal> = </literal>{ <literal
108
106
          >1</literal> | <literal>yes</literal> | <literal
113
111
          <xi:include href="mandos-options.xml" xpointer="debug"/>
114
112
        </listitem>
115
113
      </varlistentry>
116
 
      
 
114
 
117
115
      <varlistentry>
118
116
        <term><option>priority<literal> = </literal><replaceable
119
117
        >STRING</replaceable></option></term>
121
119
          <xi:include href="mandos-options.xml" xpointer="priority"/>
122
120
        </listitem>
123
121
      </varlistentry>
124
 
      
 
122
 
125
123
      <varlistentry>
126
124
        <term><option>servicename<literal> = </literal
127
125
        ><replaceable>NAME</replaceable></option></term>
131
129
        </listitem>
132
130
      </varlistentry>
133
131
      
134
 
      <varlistentry>
135
 
        <term><option>use_dbus<literal> = </literal>{ <literal
136
 
          >1</literal> | <literal>yes</literal> | <literal
137
 
          >true</literal> | <literal>on</literal> | <literal
138
 
          >0</literal> | <literal>no</literal> | <literal
139
 
          >false</literal> | <literal>off</literal> }</option></term>
140
 
        <listitem>
141
 
          <xi:include href="mandos-options.xml" xpointer="dbus"/>
142
 
        </listitem>
143
 
      </varlistentry>
144
 
      
145
132
    </variablelist>
146
133
  </refsect1>
147
134
  
157
144
    <para>
158
145
      The <literal>[DEFAULT]</literal> is necessary because the Python
159
146
      built-in module <systemitem class="library">ConfigParser</systemitem>
160
 
      requires it.
 
147
      requres it.
161
148
    </para>
162
149
  </refsect1>
163
150
  
184
171
debug = true
185
172
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
186
173
servicename = Daena
187
 
use_dbus = False
188
174
      </programlisting>
189
175
    </informalexample>
190
176
  </refsect1>
199
185
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
200
186
      <manvolnum>5</manvolnum></citerefentry>
201
187
    </para>
202
 
    
 
188
 
203
189
    <variablelist>
204
190
      <varlistentry>
205
191
        <term>