diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2019-10-21 13:53:46 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2019-10-21 13:53:46 +0300 |
commit | 7aed29afbb8b8bdd2b23f08faea19b61e2ead8ff (patch) | |
tree | ba27200023a09b29bc615aaa97ecbd3543059ee4 | |
parent | 6183e90837e16fe162aa680c08b56d426d992d75 (diff) | |
download | acmeman-7aed29afbb8b8bdd2b23f08faea19b61e2ead8ff.tar.gz acmeman-7aed29afbb8b8bdd2b23f08faea19b61e2ead8ff.tar.bz2 |
Accept multiple hostnames in the ServerAlias directivev3.01
-rw-r--r-- | Changes | 3 | ||||
-rw-r--r-- | lib/App/Acmeman.pm | 2 | ||||
-rw-r--r-- | lib/App/Acmeman/Source/Apache.pm | 3 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,6 @@ | |||
1 | 3.01 2019-10-20 | ||
2 | - Accept multiple hostnames in the ServerAlias directive | ||
3 | |||
1 | 3.00 2019-10-19 | 4 | 3.00 2019-10-19 |
2 | - Switch to ACMEv2 | 5 | - Switch to ACMEv2 |
3 | 6 | ||
diff --git a/lib/App/Acmeman.pm b/lib/App/Acmeman.pm index b54f7a4..afc64e9 100644 --- a/lib/App/Acmeman.pm +++ b/lib/App/Acmeman.pm | |||
@@ -24,7 +24,7 @@ use Text::ParseWords; | |||
24 | use App::Acmeman::Log qw(:all :sysexits); | 24 | use App::Acmeman::Log qw(:all :sysexits); |
25 | use feature 'state'; | 25 | use feature 'state'; |
26 | 26 | ||
27 | our $VERSION = '3.00'; | 27 | our $VERSION = '3.01'; |
28 | 28 | ||
29 | my $progdescr = "manages ACME certificates"; | 29 | my $progdescr = "manages ACME certificates"; |
30 | 30 | ||
diff --git a/lib/App/Acmeman/Source/Apache.pm b/lib/App/Acmeman/Source/Apache.pm index 77d7e23..1c0e677 100644 --- a/lib/App/Acmeman/Source/Apache.pm +++ b/lib/App/Acmeman/Source/Apache.pm | |||
@@ -12,6 +12,7 @@ use parent 'App::Acmeman::Source'; | |||
12 | use Getopt::Long qw(GetOptionsFromArray :config gnu_getopt no_ignore_case); | 12 | use Getopt::Long qw(GetOptionsFromArray :config gnu_getopt no_ignore_case); |
13 | use Apache::Defaults; | 13 | use Apache::Defaults; |
14 | use Apache::Config::Preproc; | 14 | use Apache::Config::Preproc; |
15 | use Text::ParseWords; | ||
15 | 16 | ||
16 | sub new { | 17 | sub new { |
17 | my $class = shift; | 18 | my $class = shift; |
@@ -96,7 +97,7 @@ sub examine_http_config { | |||
96 | foreach my $sect ($app->section(-name => "virtualhost")) { | 97 | foreach my $sect ($app->section(-name => "virtualhost")) { |
97 | my ($server_name) = (map { $self->dequote($_->value) } | 98 | my ($server_name) = (map { $self->dequote($_->value) } |
98 | $sect->directive('servername')); | 99 | $sect->directive('servername')); |
99 | my @server_aliases = map { $self->dequote($_->value) } | 100 | my @server_aliases = map { quotewords('\s+', 0, $self->dequote($_->value)) } |
100 | $sect->directive('serveralias'); | 101 | $sect->directive('serveralias'); |
101 | my @d = map { | 102 | my @d = map { |
102 | if ($_->value =~ m{^(?ix) | 103 | if ($_->value =~ m{^(?ix) |