From 294bc39102e9263a268b58fe29e03c9983ccfeca Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 3 Aug 2020 22:29:37 +0200
Subject: Change default libexec dir from /usr/lib/lacme to /usr/libexec/lacme.

---
 Changelog         | 1 +
 Makefile          | 2 +-
 config/lacme.conf | 4 ++--
 lacme             | 4 ++--
 lacme.8.md        | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Changelog b/Changelog
index a220c83..45e7a99 100644
--- a/Changelog
+++ b/Changelog
@@ -6,6 +6,7 @@ lacme (0.7) UNRELEASED;
  * Makefile: major refactoring, add install and uninstall targets, honor
    BUILD_DOCDIR and DESTDIR variables.
  * Install lacme manual to section 8.
+ * Change default libexec dir from /usr/lib/lacme to /usr/libexec/lacme.
 
  -- Guilhem Moulin <guilhem@debian.org>  Thu, 22 Aug 2019 00:31:35 +0200
 
diff --git a/Makefile b/Makefile
index 06841ee..467b834 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ prefix ?= $(DESTDIR)
 exec_prefix ?= $(prefix)
 bindir ?= $(exec_prefix)/bin
 sbindir ?= $(exec_prefix)/sbin
-libexecdir ?= $(exec_prefix)/lib
+libexecdir ?= $(exec_prefix)/libexec
 datarootdir ?= $(prefix)/share
 sysconfdir ?= $(prefix)/etc
 mandir ?= $(datarootdir)/man
diff --git a/config/lacme.conf b/config/lacme.conf
index acafe81..236d203 100644
--- a/config/lacme.conf
+++ b/config/lacme.conf
@@ -31,7 +31,7 @@
 
 # Path to the ACME client executable.
 #
-#command = /usr/lib/lacme/client
+#command = /usr/libexec/lacme/client
 
 # URI of the ACME server's directory.  NOTE: Use the staging server
 # <https://acme-staging-v02.api.letsencrypt.org/directory> for testing
@@ -84,7 +84,7 @@
 
 # Path to the ACME webserver executable.
 #
-#command = /usr/lib/lacme/webserver
+#command = /usr/libexec/lacme/webserver
 
 # Whether to automatically install iptables(8) rules to open the
 # ADDRESS[:PORT] specified with listen.  Theses rules are automatically
diff --git a/lacme b/lacme
index 5ad28a8..73180f0 100755
--- a/lacme
+++ b/lacme
@@ -93,7 +93,7 @@ do {
             socket  => (defined $ENV{XDG_RUNTIME_DIR} ? "$ENV{XDG_RUNTIME_DIR}/S.lacme" : undef),
             user    => 'nobody',
             group   => 'nogroup',
-            command => '/usr/lib/lacme/client',
+            command => '/usr/libexec/lacme/client',
             # the rest is for the ACME client
             map {$_ => undef} qw/server timeout SSL_verify SSL_version SSL_cipher_list/
         },
@@ -102,7 +102,7 @@ do {
             'challenge-directory' => undef,
             user                  => 'www-data',
             group                 => 'www-data',
-            command               => '/usr/lib/lacme/webserver',
+            command               => '/usr/libexec/lacme/webserver',
             iptables              => 'No'
 
         },
diff --git a/lacme.8.md b/lacme.8.md
index 79fb300..1d1aede 100644
--- a/lacme.8.md
+++ b/lacme.8.md
@@ -185,7 +185,7 @@ of [ACME] commands and dialogues with the remote [ACME] server).
 *command*
 
 :   Path to the [ACME] client executable.
-    Default: `/usr/lib/lacme/client`.
+    Default: `/usr/libexec/lacme/client`.
 
 *server*
 
@@ -264,7 +264,7 @@ served during certificate issuance.
 :   Path to the [ACME] webserver executable.  A separate process is
     spawned for each address to *listen* on.  (In particular no
     webserver process is forked when the *listen* option is empty.)
-    Default: `/usr/lib/lacme/webserver`.
+    Default: `/usr/libexec/lacme/webserver`.
 
 *iptables*
 
-- 
cgit v1.2.3