From ab53e139eb65e7ad9d653cae87b91b6814c79000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 16 Apr 2020 20:16:10 +0200 Subject: [PATCH] nodeconfig: drop '_additional_' from acme domain keys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit each entry represents one domain, it could also be the only one. Signed-off-by: Fabian Grünbichler --- PVE/NodeConfig.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PVE/NodeConfig.pm b/PVE/NodeConfig.pm index ff9e7bfb..07fb1434 100644 --- a/PVE/NodeConfig.pm +++ b/PVE/NodeConfig.pm @@ -81,7 +81,7 @@ my $confdesc = { }, }; -my $acme_additional_desc = { +my $acme_domain_desc = { domain => { type => 'string', format => 'pve-acme-domain', @@ -122,10 +122,10 @@ $confdesc->{acme} = { }; for my $i (0..$MAXDOMAINS) { - $confdesc->{"acme_additional_domain$i"} = { + $confdesc->{"acmedomain$i"} = { type => 'string', - description => 'ACME additional Domain', - format => $acme_additional_desc, + description => 'ACME domain and validation plugin', + format => $acme_domain_desc, optional => 1, }; }; @@ -249,12 +249,12 @@ sub get_acme_conf { $res->{account} //= 'default'; for my $index (0..$MAXDOMAINS) { - my $domain_rec = $data->{"acme_additional_domain$index"}; + my $domain_rec = $data->{"acmedomain$index"}; next if !defined($domain_rec); my $parsed = eval { PVE::JSONSchema::parse_property_string( - $acme_additional_desc, + $acme_domain_desc, $domain_rec); }; if ($@) {