summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2020-08-13 05:05:30 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2020-08-13 05:05:30 (GMT)
commitebbdbde617ddf970d112a9d0f163b5afe546117b (patch) (side-by-side diff)
treedd22f5c41daeafe3b7f88e125d5a9eea3988936e
parent02065984894e3f78ee702ba0b4618f048bb5dcf6 (diff)
downloadacmeman-ebbdbde617ddf970d112a9d0f163b5afe546117b.tar.gz
acmeman-ebbdbde617ddf970d112a9d0f163b5afe546117b.tar.bz2
Bugfixes
* lib/App/Acmeman/Config.pm (mangle): Remove stray second argument to has_key. * lib/App/Acmeman/Source.pm (define_domain): Don't force domain.X.files=default, if domain.X.files is set in the configuration.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/App/Acmeman/Config.pm2
-rw-r--r--lib/App/Acmeman/Source.pm3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/App/Acmeman/Config.pm b/lib/App/Acmeman/Config.pm
index 7c05985..6b81a25 100644
--- a/lib/App/Acmeman/Config.pm
+++ b/lib/App/Acmeman/Config.pm
@@ -52,7 +52,7 @@ sub mangle {
if (my $fnode = $self->getnode('files')) {
while (my ($k, $v) = each %{$fnode->subtree}) {
$v->set('files', $k, 'type', 'split')
- unless $v->has_key('type', 'split');
+ unless $v->has_key('type');
if ($v->subtree('type') eq 'single') {
unless ($v->has_key('certificate-file')) {
$self->error("files.$k.certificate-file not defined");
diff --git a/lib/App/Acmeman/Source.pm b/lib/App/Acmeman/Source.pm
index abae342..95e7c03 100644
--- a/lib/App/Acmeman/Source.pm
+++ b/lib/App/Acmeman/Source.pm
@@ -35,7 +35,8 @@ sub is_set {
sub define_domain {
my $self = shift;
my $cn = shift || croak "domain name must be given";
- $self->set('domain', $cn, 'files', 'default');
+ $self->set('domain', $cn, 'files', 'default')
+ unless $self->is_set('domain', $cn, 'files');
}
sub define_alias {

Return to:

Send suggestions and report system problems to the System administrator.