aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2021-02-18 01:04:45 +0100
committerGuilhem Moulin <guilhem@fripost.org>2021-02-20 20:16:34 +0100
commit1c4fc8c431e69780625600a4ee8526e1a3cbb3f4 (patch)
tree975e5fecd10f60ca61b231ec7cf9f0df9a75336c
parent11d971bc07ceb4359565e6611ae03a0c0134d153 (diff)
lacme(8)'s 'config' option in the [accountd] section no longer have a default value.
The previous default, namely /etc/lacme/lacme-accountd.conf, is still honored when there is the user running lacme doesn't have a ~/.config/lacme/lacme-account.conf configuration file.
-rw-r--r--Changelog4
-rw-r--r--config/lacme.conf2
-rwxr-xr-xlacme4
-rw-r--r--lacme.8.md1
4 files changed, 7 insertions, 4 deletions
diff --git a/Changelog b/Changelog
index 9e58239..a700625 100644
--- a/Changelog
+++ b/Changelog
@@ -28,6 +28,10 @@ lacme (0.7.1) upstream;
remote lacme-accountd server for instance.
* Add test suite against Let's Encrypt's staging environment
https://letsencrypt.org/docs/staging-environment/ .
+ * lacme(8)'s 'config' option in the [accountd] section no longer have a
+ default value. The previous default /etc/lacme/lacme-accountd.conf
+ is still honored when there is the user running lacme doesn't have a
+ ~/.config/lacme/lacme-account.conf configuration file.
+ Improve nginx/apache2 snippets for direct serving of challenge files
(with the new 'challenge-directory' logic symlinks can be disabled).
+ Split Nginx and Apapche2 static configuration snippets into seperate
diff --git a/config/lacme.conf b/config/lacme.conf
index 3faed2b..0deba7b 100644
--- a/config/lacme.conf
+++ b/config/lacme.conf
@@ -116,7 +116,7 @@
# Path to the lacme-accountd(1) configuration file.
#
-#config = @@sysconfdir@@/lacme/lacme-accountd.conf
+#config =
# The (private) account key to use for signing requests. See
# lacme-accountd(1) for details.
diff --git a/lacme b/lacme
index 2f239e2..7800429 100755
--- a/lacme
+++ b/lacme
@@ -114,7 +114,7 @@ do {
user => '',
group => '',
command => '@@bindir@@/lacme-accountd',
- config => '@@sysconfdir@@/lacme/lacme-accountd.conf',
+ config => '',
privkey => undef,
quiet => 'Yes',
}
@@ -511,7 +511,7 @@ sub acme_client($@) {
open STDOUT, '>&', $s or die "dup: $!";
my ($cmd, @args) = split(/\s+/, $accountd->{command}) or die "Empty accountd command\n";
push @args, '--stdio';
- push @args, '--config='.$accountd->{config} if defined $accountd->{config};
+ push @args, '--config='.$accountd->{config} if $accountd->{config} ne '';
push @args, '--privkey='.$accountd->{privkey} if defined $accountd->{privkey};
push @args, '--quiet' unless lc $accountd->{quiet} eq 'no';
push @args, '--debug' if $OPTS{debug};
diff --git a/lacme.8.md b/lacme.8.md
index c354c1a..c32469d 100644
--- a/lacme.8.md
+++ b/lacme.8.md
@@ -315,7 +315,6 @@ UNIX-domain socket.
*config*
: Path to the [`lacme-accountd`(1)] configuration file.
- Default: `@@sysconfdir@@/lacme/lacme-accountd.conf`.
*privkey*