/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 plugins.d/password-request.xml

  • Committer: Teddy Hogeborn
  • Date: 2008-09-03 20:31:19 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080903203119-0q6dii46hj3uf4ni
* plugins.d/password-request.xml (SYNOPSYS): Removed "--keydir".
  (OPTIONS): Removed "--keydir" and changed text of "--pubkey" and
             "--seckey".
  (EXAMPLE): Altered not to use "--keydir" anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/password-request.xml
62
62
      </group>
63
63
      <sbr/>
64
64
      <group>
65
 
        <arg choice="plain"><option>--keydir
66
 
        <replaceable>DIRECTORY</replaceable></option></arg>
67
 
        <arg choice="plain"><option>-d
68
 
        <replaceable>DIRECTORY</replaceable></option></arg>
69
 
      </group>
70
 
      <sbr/>
71
 
      <group>
72
65
        <arg choice="plain"><option>--interface
73
66
        <replaceable>NAME</replaceable></option></arg>
74
67
        <arg choice="plain"><option>-i
191
184
      </varlistentry>
192
185
      
193
186
      <varlistentry>
194
 
        <term><option>--keydir=<replaceable
195
 
        >DIRECTORY</replaceable></option></term>
196
 
        <term><option>-d
197
 
        <replaceable>DIRECTORY</replaceable></option></term>
198
 
        <listitem>
199
 
          <para>
200
 
            Directory to read the OpenPGP key files
201
 
            <filename>pubkey.txt</filename> and
202
 
            <filename>seckey.txt</filename> from.  The default is
203
 
            <filename>/conf/conf.d/mandos</filename> (in the initial
204
 
            <acronym>RAM</acronym> disk environment).
205
 
          </para>
206
 
        </listitem>
207
 
      </varlistentry>
208
 
 
209
 
      <varlistentry>
210
187
        <term><option>--interface=
211
188
        <replaceable>NAME</replaceable></option></term>
212
189
        <term><option>-i
232
209
        <replaceable>FILE</replaceable></option></term>
233
210
        <listitem>
234
211
          <para>
235
 
            OpenPGP public key file base name.  This will be combined
236
 
            with the directory from the <option>--keydir</option>
237
 
            option to form an absolute file name.  The default name is
238
 
            <quote><literal>pubkey.txt</literal></quote>.
 
212
            OpenPGP public key file name.  The default name is
 
213
            <quote><filename>/conf/conf.d/mandos/pubkey.txt</filename
 
214
            ></quote>.
239
215
          </para>
240
216
        </listitem>
241
217
      </varlistentry>
247
223
        <replaceable>FILE</replaceable></option></term>
248
224
        <listitem>
249
225
          <para>
250
 
            OpenPGP secret key file base name.  This will be combined
251
 
            with the directory from the <option>--keydir</option>
252
 
            option to form an absolute file name.  The default name is
253
 
            <quote><literal>seckey.txt</literal></quote>.
 
226
            OpenPGP secret key file name.  The default name is
 
227
            <quote><filename>/conf/conf.d/mandos/seckey.txt</filename
 
228
            ></quote>.
254
229
          </para>
255
230
        </listitem>
256
231
      </varlistentry>
420
395
    </informalexample>
421
396
    <informalexample>
422
397
      <para>
423
 
        Run in debug mode, and use a custom key directory:
 
398
        Run in debug mode, and use a custom key:
424
399
      </para>
425
400
      <para>
426
 
        <!-- do not wrap this line -->
427
 
        <userinput>&COMMANDNAME; --debug --keydir keydir</userinput>
 
401
 
 
402
<!-- do not wrap this line -->
 
403
<userinput>&COMMANDNAME; --debug --pubkey keydir/pubkey.txt --seckey keydir/seckey.txt</userinput>
 
404
 
428
405
      </para>
429
406
    </informalexample>
430
407
    <informalexample>
431
408
      <para>
432
 
        Run in debug mode, with a custom key directory, and do not use
433
 
        Zeroconf to locate a server; connect directly to the IPv6
434
 
        address <quote><systemitem class="ipaddress"
 
409
        Run in debug mode, with a custom key, and do not use Zeroconf
 
410
        to locate a server; connect directly to the IPv6 address
 
411
        <quote><systemitem class="ipaddress"
435
412
        >2001:db8:f983:bd0b:30de:ae4a:71f2:f672</systemitem></quote>,
436
413
        port 4711, using interface eth2:
437
414
      </para>
438
415
      <para>
439
416
 
440
417
<!-- do not wrap this line -->
441
 
<userinput>&COMMANDNAME; --debug --keydir keydir --connect 2001:db8:f983:bd0b:30de:ae4a:71f2:f672:4711 --interface eth2</userinput>
 
418
<userinput>&COMMANDNAME; --debug --pubkey keydir/pubkey.txt --seckey keydir/seckey.txt --connect 2001:db8:f983:bd0b:30de:ae4a:71f2:f672:4711 --interface eth2</userinput>
442
419
 
443
420
      </para>
444
421
    </informalexample>