/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: 2009-02-09 05:48:04 UTC
  • mfrom: (24.1.134 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090209054804-6phrjjrzjlpvuz7u
Merge from Björn:

* plugin-runner.c (main): Bug fix: For the "--options-for" option, do
                          not mangle arguments with colon characters.
                          Also support adding empty arguments.

* plugins.d/mandos-client.c: (mc): New global variable; moved from
                                   "main".
  (init_gpgme, pgp_packet_decrypt, init_gnutls_global,
  init_gnutls_session, start_mandos_communication): Removed "mc"
                                                    argument.  All
                                                    callers changed.

  (resolve_callback, browse_callback): Ignore "userdata" argument.
                                       All callers changed.
  (handle_sigterm): New function.
  (main): Add "handle_sigterm" as signal handler for SIGTERM before
          starting the main loop.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2013-10-23">
 
6
<!ENTITY TIMESTAMP "2009-01-04">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
20
20
        <firstname>Björn</firstname>
21
21
        <surname>Påhlsson</surname>
22
22
        <address>
23
 
          <email>belorn@recompile.se</email>
 
23
          <email>belorn@fukt.bsnet.se</email>
24
24
        </address>
25
25
      </author>
26
26
      <author>
27
27
        <firstname>Teddy</firstname>
28
28
        <surname>Hogeborn</surname>
29
29
        <address>
30
 
          <email>teddy@recompile.se</email>
 
30
          <email>teddy@fukt.bsnet.se</email>
31
31
        </address>
32
32
      </author>
33
33
    </authorgroup>
34
34
    <copyright>
35
35
      <year>2008</year>
36
36
      <year>2009</year>
37
 
      <year>2011</year>
38
 
      <year>2012</year>
39
 
      <year>2013</year>
40
37
      <holder>Teddy Hogeborn</holder>
41
38
      <holder>Björn Påhlsson</holder>
42
39
    </copyright>
121
118
        <term><option>priority<literal> = </literal><replaceable
122
119
        >STRING</replaceable></option></term>
123
120
        <listitem>
124
 
          <xi:include href="mandos-options.xml"
125
 
                      xpointer="priority_compat"/>
 
121
          <xi:include href="mandos-options.xml" xpointer="priority"/>
126
122
        </listitem>
127
123
      </varlistentry>
128
124
      
146
142
        </listitem>
147
143
      </varlistentry>
148
144
      
149
 
      <varlistentry>
150
 
        <term><option>use_ipv6<literal> = </literal>{ <literal
151
 
          >1</literal> | <literal>yes</literal> | <literal
152
 
          >true</literal> | <literal>on</literal> | <literal
153
 
          >0</literal> | <literal>no</literal> | <literal
154
 
          >false</literal> | <literal>off</literal> }</option></term>
155
 
        <listitem>
156
 
          <xi:include href="mandos-options.xml" xpointer="ipv6"/>
157
 
        </listitem>
158
 
      </varlistentry>
159
 
      
160
 
      <varlistentry>
161
 
        <term><option>restore<literal> = </literal>{ <literal
162
 
          >1</literal> | <literal>yes</literal> | <literal
163
 
          >true</literal> | <literal>on</literal> | <literal
164
 
          >0</literal> | <literal>no</literal> | <literal
165
 
          >false</literal> | <literal>off</literal> }</option></term>
166
 
        <listitem>
167
 
          <xi:include href="mandos-options.xml" xpointer="restore"/>
168
 
        </listitem>
169
 
      </varlistentry>
170
 
      
171
 
      <varlistentry>
172
 
        <term><option>statedir<literal> = </literal><replaceable
173
 
        >DIRECTORY</replaceable></option></term>
174
 
        <listitem>
175
 
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
176
 
        </listitem>
177
 
      </varlistentry>
178
 
      
179
 
      <varlistentry>
180
 
        <term><option>socket<literal> = </literal><replaceable
181
 
        >NUMBER</replaceable></option></term>
182
 
        <listitem>
183
 
          <xi:include href="mandos-options.xml" xpointer="socket"/>
184
 
        </listitem>
185
 
      </varlistentry>
186
 
      
187
145
    </variablelist>
188
146
  </refsect1>
189
147
  
221
179
[DEFAULT]
222
180
# A configuration example
223
181
interface = eth0
224
 
address = fe80::aede:48ff:fe71:f6f2
 
182
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
225
183
port = 1025
226
184
debug = true
227
185
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
228
186
servicename = Daena
229
187
use_dbus = False
230
 
use_ipv6 = True
231
 
restore = True
232
 
statedir = /var/lib/mandos
233
188
      </programlisting>
234
189
    </informalexample>
235
190
  </refsect1>
237
192
  <refsect1 id="see_also">
238
193
    <title>SEE ALSO</title>
239
194
    <para>
240
 
      <citerefentry><refentrytitle>intro</refentrytitle>
241
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
242
195
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
243
196
      ><manvolnum>3</manvolnum></citerefentry>,
244
197
      <citerefentry><refentrytitle>mandos</refentrytitle>
272
225
              <para>
273
226
                The clients use IPv6 link-local addresses, which are
274
227
                immediately usable since a link-local addresses is
275
 
                automatically assigned to a network interface when it
 
228
                automatically assigned to a network interfaces when it
276
229
                is brought up.
277
230
              </para>
278
231
            </listitem>