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

  • Committer: Teddy Hogeborn
  • Date: 2008-09-01 16:53:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080901165317-77dccp81zyqimt2j
* plugin-runner.c (add_environment): Override existing environment
                                     variables when asked to do so.
                                     All callers changed.
  (main): Removed old argp.args_doc string.  Parse argument file
          before normal command line arguments.  Use ARGP_IN_ORDER
          flag in both calls to argp_parse.  Do not strdup() strings
          to be sent to add_environment().

* plugin-runner.xml (OPTIONS): Document "--global-env" and "--envs-for".
  (FILES): Note that the config file is parsed before the command line
           options.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
4
4
<!ENTITY VERSION "1.0">
5
5
<!ENTITY CONFNAME "mandos.conf">
6
6
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
7
 
<!ENTITY TIMESTAMP "2008-09-12">
 
7
<!ENTITY TIMESTAMP "2008-08-31">
8
8
]>
9
9
 
10
10
<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
37
37
    </copyright>
38
38
    <xi:include href="legalnotice.xml"/>
39
39
  </refentryinfo>
40
 
  
 
40
 
41
41
  <refmeta>
42
42
    <refentrytitle>&CONFNAME;</refentrytitle>
43
43
    <manvolnum>5</manvolnum>
49
49
      Configuration file for the Mandos server
50
50
    </refpurpose>
51
51
  </refnamediv>
52
 
  
 
52
 
53
53
  <refsynopsisdiv>
54
54
    <synopsis>&CONFPATH;</synopsis>
55
55
  </refsynopsisdiv>
56
 
  
 
56
 
57
57
  <refsect1 id="description">
58
58
    <title>DESCRIPTION</title>
59
59
    <para>
71
71
      <quote>#</quote> or <quote>;</quote> are ignored and may be used
72
72
      to provide comments.
73
73
    </para>
74
 
    
 
74
 
75
75
  </refsect1>
76
76
  <refsect1>
77
77
    <title>OPTIONS</title>
84
84
          <xi:include href="mandos-options.xml" xpointer="interface"/>
85
85
        </listitem>
86
86
      </varlistentry>
87
 
      
 
87
 
88
88
      <varlistentry>
89
89
        <term><option>address<literal> = </literal><replaceable
90
90
          >ADDRESS</replaceable></option></term>
92
92
          <xi:include href="mandos-options.xml" xpointer="address"/>
93
93
        </listitem>
94
94
      </varlistentry>
95
 
      
 
95
 
96
96
      <varlistentry>
97
97
        <term><option>port<literal> = </literal><replaceable
98
98
        >NUMBER</replaceable></option></term>
100
100
          <xi:include href="mandos-options.xml" xpointer="port"/>
101
101
        </listitem>
102
102
      </varlistentry>
103
 
      
 
103
 
104
104
      <varlistentry>
105
105
        <term><option>debug<literal> = </literal>{ <literal
106
106
          >1</literal> | <literal>yes</literal> | <literal
111
111
          <xi:include href="mandos-options.xml" xpointer="debug"/>
112
112
        </listitem>
113
113
      </varlistentry>
114
 
      
 
114
 
115
115
      <varlistentry>
116
116
        <term><option>priority<literal> = </literal><replaceable
117
117
        >STRING</replaceable></option></term>
119
119
          <xi:include href="mandos-options.xml" xpointer="priority"/>
120
120
        </listitem>
121
121
      </varlistentry>
122
 
      
 
122
 
123
123
      <varlistentry>
124
124
        <term><option>servicename<literal> = </literal
125
125
        ><replaceable>NAME</replaceable></option></term>
144
144
    <para>
145
145
      The <literal>[DEFAULT]</literal> is necessary because the Python
146
146
      built-in module <systemitem class="library">ConfigParser</systemitem>
147
 
      requires it.
 
147
      requres it.
148
148
    </para>
149
149
  </refsect1>
150
150
  
185
185
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
186
186
      <manvolnum>5</manvolnum></citerefentry>
187
187
    </para>
188
 
    
 
188
 
189
189
    <variablelist>
190
190
      <varlistentry>
191
191
        <term>