nodeconfig: drop '_additional_' from acme domain keys

each entry represents one domain, it could also be the only one.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-04-16 20:16:10 +02:00 committed by Thomas Lamprecht
parent b456a0f31a
commit ab53e139eb

View File

@ -81,7 +81,7 @@ my $confdesc = {
}, },
}; };
my $acme_additional_desc = { my $acme_domain_desc = {
domain => { domain => {
type => 'string', type => 'string',
format => 'pve-acme-domain', format => 'pve-acme-domain',
@ -122,10 +122,10 @@ $confdesc->{acme} = {
}; };
for my $i (0..$MAXDOMAINS) { for my $i (0..$MAXDOMAINS) {
$confdesc->{"acme_additional_domain$i"} = { $confdesc->{"acmedomain$i"} = {
type => 'string', type => 'string',
description => 'ACME additional Domain', description => 'ACME domain and validation plugin',
format => $acme_additional_desc, format => $acme_domain_desc,
optional => 1, optional => 1,
}; };
}; };
@ -249,12 +249,12 @@ sub get_acme_conf {
$res->{account} //= 'default'; $res->{account} //= 'default';
for my $index (0..$MAXDOMAINS) { for my $index (0..$MAXDOMAINS) {
my $domain_rec = $data->{"acme_additional_domain$index"}; my $domain_rec = $data->{"acmedomain$index"};
next if !defined($domain_rec); next if !defined($domain_rec);
my $parsed = eval { my $parsed = eval {
PVE::JSONSchema::parse_property_string( PVE::JSONSchema::parse_property_string(
$acme_additional_desc, $acme_domain_desc,
$domain_rec); $domain_rec);
}; };
if ($@) { if ($@) {