diff options
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | config/lacme.conf | 3 | ||||
| -rwxr-xr-x | lacme | 2 | ||||
| -rw-r--r-- | lacme.md | 2 | 
5 files changed, 6 insertions, 5 deletions
| @@ -9,7 +9,7 @@ lacme (0.2) upstream;    + lacme: add an option --quiet to avoid mentioning valid certs (useful      in cronjobs)    + "config-certs" now points to a space separated list of files or -    directories.  New default "lacme-certs.conf lacme-certs.d/". +    directories.  New default "lacme-certs.conf lacme-certs.conf.d/".    - Minor manpage fixes    - More useful message upon Validation Challenge failure. @@ -25,7 +25,7 @@ all: ${MANPAGES}  install: ${MANPAGES}  	install -d $(DESTDIR)/etc/lacme -	install -d $(DESTDIR)/etc/lacme/lacme-certs.d +	install -d $(DESTDIR)/etc/lacme/lacme-certs.conf.d  	install -m0644 -t $(DESTDIR)/etc/lacme config/*.conf  	install -d $(DESTDIR)/usr/share/lacme  	install -m0644 -t $(DESTDIR)/usr/share/lacme certs/lets-encrypt-x[1-4]-cross-signed.pem diff --git a/config/lacme.conf b/config/lacme.conf index f963128..c5efb03 100644 --- a/config/lacme.conf +++ b/config/lacme.conf @@ -1,7 +1,7 @@  # For certificate issuance (new-cert command), specify a space-separated  # certificate configuration files or directories to use  # -#config-certs = lacme-certs.conf lacme-certs.d/ +#config-certs = lacme-certs.conf lacme-certs.conf.d/  [client] @@ -85,6 +85,7 @@  #group = www-data  # Path to the ACME webserver executable. +#  #command = /usr/lib/lacme/webserver  # Whether to automatically install iptables(8) rules to open the @@ -561,7 +561,7 @@ if ($COMMAND eq 'new-reg' or $COMMAND =~ /^reg=/) {  elsif ($COMMAND eq 'new-cert') {      my $conffiles = defined $OPTS{'config-certs'} ? $OPTS{'config-certs'}                    : defined $CONFIG->{_}->{'config-certs'} ? [ split(/\s+/, $CONFIG->{_}->{'config-certs'}) ] -                  : [ "$NAME-certs.conf", "$NAME-certs.d/" ]; +                  : [ "$NAME-certs.conf", "$NAME-certs.conf.d/" ];      my $conf;      foreach my $conffile (@$conffiles) {          $conffile = ($CONFFILENAME =~ s#[^/]+\z##r).$conffile unless $conffile =~ /\A\//; @@ -162,7 +162,7 @@ Default section      taking precedence.  Files in a directory are processed in      lexicographic order, only considering the ones with suffix `.conf`. -    Default: `lacme-certs.conf lacme-certs.d/`. +    Default: `lacme-certs.conf lacme-certs.conf.d/`.  `[client]` section  ------------------ | 
