/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 plugin-runner.xml

  • Committer: teddy at recompile
  • Date: 2020-02-09 03:54:46 UTC
  • Revision ID: teddy@recompile.se-20200209035446-kud6h0l6u30lo10h
Makefile: fix targets run-server & run-client with GnuTLS 3.5.9

* Makefile (keydir/tls-privkey.pem keydir/tls-pubkey.pem): If the TLS
  session keys were not generated by mandos-keygen (which will happen
  with GnuTLS version 3.5.9 or older), create dummy empty unused files
  to avoid confusing make(1), which would otherwise re-run this target
  and create new OpenPGP key files which would not match the key
  fingerprint in the confdir/clients.conf file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.xml
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
4
<!ENTITY COMMANDNAME "plugin-runner">
5
 
<!ENTITY TIMESTAMP "2019-02-10">
 
5
<!ENTITY TIMESTAMP "2019-07-26">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
628
628
      <para>
629
629
        Read a different configuration file, run plugins from a
630
630
        different directory, specify an alternate plugin helper
631
 
        directory and add two options to the
 
631
        directory and add four options to the
632
632
        <citerefentry><refentrytitle >mandos-client</refentrytitle>
633
633
        <manvolnum>8mandos</manvolnum></citerefentry> plugin:
634
634
      </para>
635
635
      <para>
636
636
 
637
637
<!-- do not wrap this line -->
638
 
<userinput>cd /etc/keys/mandos; &COMMANDNAME;  --config-file=/etc/mandos/plugin-runner.conf --plugin-dir /usr/lib/x86_64-linux-gnu/mandos/plugins.d --plugin-helper-dir /usr/lib/x86_64-linux-gnu/mandos/plugin-helpers --options-for=mandos-client:--pubkey=pubkey.txt,--seckey=seckey.txt,--tls-pubkey=tls-pubkey.pem,--tls-privkey=tls-privkey.pem</userinput>
 
638
<userinput>cd /etc/keys/mandos; &COMMANDNAME;  --config-file=/etc/mandos/plugin-runner.conf --plugin-dir /usr/lib/x86_64-linux-gnu/mandos/plugins.d --plugin-helper-dir /usr/lib/x86_64-linux-gnu/mandos/plugin-helpers --options-for=mandos-client:--pubkey=pubkey.txt,&#x200b;--seckey=seckey.txt,&#x200b;--tls-pubkey=tls-pubkey.pem,&#x200b;--tls-privkey=tls-privkey.pem</userinput>
639
639
 
640
640
      </para>
641
641
    </informalexample>