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.

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 {