From da8b727f156d23553eecb90e8731d39c6027cb02 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 4 Aug 2020 00:00:58 +0200
Subject: Makefile: Use variables for target directories etc.

---
 lacme | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lacme')

diff --git a/lacme b/lacme
index 73180f0..566545b 100755
--- a/lacme
+++ b/lacme
@@ -75,7 +75,7 @@ sub set_FD_CLOEXEC($$);
 my $CONFFILENAME = $OPTS{config} // first { -f $_ }
    ( "./$NAME.conf"
    , ($ENV{XDG_CONFIG_HOME} // "$ENV{HOME}/.config")."/lacme/$NAME.conf"
-   , "/etc/lacme/$NAME.conf"
+   , "@@sysconfdir@@/lacme/$NAME.conf"
    );
 do {
     die "Error: Can't find configuration file\n" unless defined $CONFFILENAME;
@@ -93,24 +93,24 @@ do {
             socket  => (defined $ENV{XDG_RUNTIME_DIR} ? "$ENV{XDG_RUNTIME_DIR}/S.lacme" : undef),
             user    => 'nobody',
             group   => 'nogroup',
-            command => '/usr/libexec/lacme/client',
+            command => '@@libexecdir@@/lacme/client',
             # the rest is for the ACME client
             map {$_ => undef} qw/server timeout SSL_verify SSL_version SSL_cipher_list/
         },
         webserver => {
-            listen                => '/run/lacme-www.socket',
+            listen                => '@@runstatedir@@/lacme-www.socket',
             'challenge-directory' => undef,
             user                  => 'www-data',
             group                 => 'www-data',
-            command               => '/usr/libexec/lacme/webserver',
+            command               => '@@libexecdir@@/lacme/webserver',
             iptables              => 'No'
 
         },
         accountd => {
             user    => '',
             group   => '',
-            command => '/usr/bin/lacme-accountd',
-            config  => '/etc/lacme/lacme-accountd.conf',
+            command => '@@bindir@@/lacme-accountd',
+            config  => '@@sysconfdir@@/lacme/lacme-accountd.conf',
             privkey => undef,
             quiet   => 'Yes',
         }
@@ -743,7 +743,7 @@ elsif ($COMMAND eq 'newOrder' or $COMMAND eq 'new-cert') {
         };
 
         # verify certificate validity against the CA
-        $conf->{CAfile} //= '/usr/share/lacme/lets-encrypt-x3-cross-signed.pem';
+        $conf->{CAfile} //= '@@datadir@@/lacme/lets-encrypt-x3-cross-signed.pem';
         if ($conf->{CAfile} ne '' and spawn({in => $x509}, 'openssl', 'verify', '-CAfile', $conf->{CAfile},
                                                                       qw/-purpose sslserver -x509_strict/)) {
             print STDERR "[$s] Error: Received invalid X.509 certificate from ACME server!\n";
-- 
cgit v1.2.3