summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@sunet.se>2020-02-19 10:46:03 +0100
committerLinus Nordberg <linus@sunet.se>2020-02-19 10:46:03 +0100
commit031e92e0956b929fdba3c4033550cfa49b80e648 (patch)
tree6f60d7a60ef43d784376c043df4cc9051b317632
parentc64f54a832768be6f0252f6aad4766c227f9c13d (diff)
Sane default path to p11-kit-remote
This is where the Debian package installs it.
-rw-r--r--p11p-daemon/config/sys.config2
-rw-r--r--p11p-daemon/src/p11p_config.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/p11p-daemon/config/sys.config b/p11p-daemon/config/sys.config
index 769aecf..82b6d36 100644
--- a/p11p-daemon/config/sys.config
+++ b/p11p-daemon/config/sys.config
@@ -5,7 +5,7 @@
{loglevel, 3},
{socket_dir, "/run/p11p"}, % Default: /run/user/$EUID/p11p.
%%{socket_path_has_pid, false}, % Default: true.
- {proxyapp_bin_path, "/usr/lib/x86_64-linux-gnu/p11-kit/p11-kit-remote"},
+ %%{proxyapp_bin_path, "/path/to/p11-kit-remote"}, % Default: /usr/lib/x86_64-linux-gnu/p11-kit/p11-kit-remote
{testing_drop_prob, 0}, % Default: 0.
{vtokens,
[{"vtoken0",
diff --git a/p11p-daemon/src/p11p_config.erl b/p11p-daemon/src/p11p_config.erl
index 2ee578b..6ec8fbb 100644
--- a/p11p-daemon/src/p11p_config.erl
+++ b/p11p-daemon/src/p11p_config.erl
@@ -149,7 +149,7 @@ nameof(List) ->
%%% Private functions %%%
--define(PROXYAPP_DEFAULT, "/usr/local/libexec/p11-kit/p11-kit-remote").
+-define(PROXYAPP_DEFAULT, "/usr/lib/x86_64-linux-gnu/p11-kit/p11-kit-remote").
init_state() ->
#state{
socket_dir = application:get_env(p11p,