summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2019-10-21 10:53:46 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2019-10-21 10:53:46 (GMT)
commit7aed29afbb8b8bdd2b23f08faea19b61e2ead8ff (patch) (side-by-side diff)
treeba27200023a09b29bc615aaa97ecbd3543059ee4
parent6183e90837e16fe162aa680c08b56d426d992d75 (diff)
downloadacmeman-7aed29afbb8b8bdd2b23f08faea19b61e2ead8ff.tar.gz
acmeman-7aed29afbb8b8bdd2b23f08faea19b61e2ead8ff.tar.bz2
Accept multiple hostnames in the ServerAlias directivev3.01
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.pm3
3 files changed, 6 insertions, 2 deletions
diff --git a/Changes b/Changes
index 61ba3da..06bca2b 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+3.01 2019-10-20
+ - Accept multiple hostnames in the ServerAlias directive
+
3.00 2019-10-19
- Switch to ACMEv2
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;
use App::Acmeman::Log qw(:all :sysexits);
use feature 'state';
-our $VERSION = '3.00';
+our $VERSION = '3.01';
my $progdescr = "manages ACME certificates";
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';
use Getopt::Long qw(GetOptionsFromArray :config gnu_getopt no_ignore_case);
use Apache::Defaults;
use Apache::Config::Preproc;
+use Text::ParseWords;
sub new {
my $class = shift;
@@ -96,7 +97,7 @@ 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 { $self->dequote($_->value) }
+ my @server_aliases = map { quotewords('\s+', 0, $self->dequote($_->value)) }
$sect->directive('serveralias');
my @d = map {
if ($_->value =~ m{^(?ix)

Return to:

Send suggestions and report system problems to the System administrator.