aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2019-10-21 13:53:46 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2019-10-21 13:53:46 +0300
commit7aed29afbb8b8bdd2b23f08faea19b61e2ead8ff (patch)
treeba27200023a09b29bc615aaa97ecbd3543059ee4
parent6183e90837e16fe162aa680c08b56d426d992d75 (diff)
downloadacmeman-7aed29afbb8b8bdd2b23f08faea19b61e2ead8ff.tar.gz
acmeman-7aed29afbb8b8bdd2b23f08faea19b61e2ead8ff.tar.bz2
Accept multiple hostnames in the ServerAlias directivev3.01
-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 @@
13.01 2019-10-20
2 - Accept multiple hostnames in the ServerAlias directive
3
13.00 2019-10-19 43.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;
24use App::Acmeman::Log qw(:all :sysexits); 24use App::Acmeman::Log qw(:all :sysexits);
25use feature 'state'; 25use feature 'state';
26 26
27our $VERSION = '3.00'; 27our $VERSION = '3.01';
28 28
29my $progdescr = "manages ACME certificates"; 29my $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';
12use Getopt::Long qw(GetOptionsFromArray :config gnu_getopt no_ignore_case); 12use Getopt::Long qw(GetOptionsFromArray :config gnu_getopt no_ignore_case);
13use Apache::Defaults; 13use Apache::Defaults;
14use Apache::Config::Preproc; 14use Apache::Config::Preproc;
15use Text::ParseWords;
15 16
16sub new { 17sub 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)

Return to:

Send suggestions and report system problems to the System administrator.