/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 Hogeborn
  • Date: 2023-02-12 17:49:24 UTC
  • Revision ID: teddy@recompile.se-20230212174924-y7fnckjje5xsd9lb
Move D-Bus policy file to /usr/share/dbus-1/session.d

According to dbus-daeemon(1), the correct place for D-Bus policy files
is not "/etc/dbus-1/session.d" but "/usr/share/dbus-1/session.d" (and
Lintian 2.116.0 warns about this).  Therefore, move the file.

* Makefile (DBUSPOLICYDIR): New; set to
  "$(DESTDIR)/usr/share/dbus-1/system.d".
  (install-server): Use $(DBUSPOLICYDIR).
* debian/mandos.dirs (etc/dbus-1/system.d): Remove.
  (usr/share/dbus-1/system.d): New.
* debian/mandos.maintscript: New.

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 "2018-02-08">
 
5
<!ENTITY TIMESTAMP "2019-07-26">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
42
42
      <year>2016</year>
43
43
      <year>2017</year>
44
44
      <year>2018</year>
 
45
      <year>2019</year>
45
46
      <holder>Teddy Hogeborn</holder>
46
47
      <holder>Björn Påhlsson</holder>
47
48
    </copyright>
627
628
      <para>
628
629
        Read a different configuration file, run plugins from a
629
630
        different directory, specify an alternate plugin helper
630
 
        directory and add two options to the
 
631
        directory and add four options to the
631
632
        <citerefentry><refentrytitle >mandos-client</refentrytitle>
632
633
        <manvolnum>8mandos</manvolnum></citerefentry> plugin:
633
634
      </para>
634
635
      <para>
635
636
 
636
637
<!-- do not wrap this line -->
637
 
<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</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>
638
639
 
639
640
      </para>
640
641
    </informalexample>