summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2019-10-23 11:38:56 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2019-10-23 11:38:56 (GMT)
commit4185f852471106b55ba430b81a1c5f09decdf16e (patch) (side-by-side diff)
treecd162d896448872b1f70e7cc5583d14f469e440b
parent7aed29afbb8b8bdd2b23f08faea19b61e2ead8ff (diff)
downloadacmeman-4185f852471106b55ba430b81a1c5f09decdf16e.tar.gz
acmeman-4185f852471106b55ba430b81a1c5f09decdf16e.tar.bz2
Take into account ServerName if LetsEncryptReference is given.v3.02
* lib/App/Acmeman/Source/Apache.pm (examine_http_config): Take into account ServerName if LetsEncryptReference is given. * Changes: Update. * lib/App/Acmeman.pm: Version 3.02
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Changes3
-rw-r--r--lib/App/Acmeman.pm2
-rw-r--r--lib/App/Acmeman/Source/Apache.pm5
3 files changed, 7 insertions, 3 deletions
diff --git a/Changes b/Changes
index 06bca2b..fe59d18 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+3.02 2019-10-23
+ - Take into account ServerName if LetsEncryptReference is given.
+
3.01 2019-10-20
- Accept multiple hostnames in the ServerAlias directive
diff --git a/lib/App/Acmeman.pm b/lib/App/Acmeman.pm
index afc64e9..76b8fb1 100644
--- a/lib/App/Acmeman.pm
+++ b/lib/App/Acmeman.pm
@@ -24,7 +24,7 @@ use Text::ParseWords;
use App::Acmeman::Log qw(:all :sysexits);
use feature 'state';
-our $VERSION = '3.01';
+our $VERSION = '3.02';
my $progdescr = "manages ACME certificates";
diff --git a/lib/App/Acmeman/Source/Apache.pm b/lib/App/Acmeman/Source/Apache.pm
index 1c0e677..58ba39e 100644
--- a/lib/App/Acmeman/Source/Apache.pm
+++ b/lib/App/Acmeman/Source/Apache.pm
@@ -97,7 +97,8 @@ sub examine_http_config {
foreach my $sect ($app->section(-name => "virtualhost")) {
my ($server_name) = (map { $self->dequote($_->value) }
$sect->directive('servername'));
- my @server_aliases = map { quotewords('\s+', 0, $self->dequote($_->value)) }
+ my @server_aliases = map { quotewords('\s+', 0,
+ $self->dequote($_->value)) }
$sect->directive('serveralias');
my @d = map {
if ($_->value =~ m{^(?ix)
@@ -119,7 +120,7 @@ sub examine_http_config {
} elsif (my ($ref) = map { $_->[1] }
grep { $_->[0] eq 'reference' } @d) {
$self->set('domain', $ref, 'files', 'apache');
- $self->define_alias($ref, @server_aliases);
+ $self->define_alias($ref, $server_name, @server_aliases);
}
}
return 1;

Return to:

Send suggestions and report system problems to the System administrator.