proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-12 21:44:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Extend node config in the acme section.

Browse Source 
Allow additional domains with different sub-plugins,
However, only one domain per additional entry is permitted.

Signed-off-by: Wolfgang Link <w.link@proxmox.com>
This commit is contained in:
Wolfgang Link 2020-04-16 07:18:23 +02:00 committed by Thomas Lamprecht
parent d9012197b3
commit cc442d3ee2
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
PVE/NodeConfig.pm
View File

@ -6,6 +6,10 @@ use warnings;
use PVE::CertHelpers; use PVE::CertHelpers;
use PVE::JSONSchema qw(get_standard_option); use PVE::JSONSchema qw(get_standard_option);
use PVE::Tools qw(file_get_contents file_set_contents lock_file); use PVE::Tools qw(file_get_contents file_set_contents lock_file);
use PVE::ACME;
# register up to 20 domain names
my $MAXDOMAINS = 20;
my $node_config_lock = '/var/lock/pvenode.lock'; my $node_config_lock = '/var/lock/pvenode.lock';
@ -77,6 +81,29 @@ my $confdesc = {
}, },
}; };
my $acme_additional_desc = {
domain => {
type => 'string',
format => 'pve-acme-domain',
format_description => 'domain',
description => 'domain for this node\'s ACME certificate',
},
plugin => {
type => 'string',
format => 'pve-configid',
description => 'The plugin ID, default is standalone http',
format_description => 'name of the plugin configuration',
},
alias => {
type => 'string',
format => 'pve-acme-domain',
format_description => 'domain',
description => 'Alias for the Domain to verify ACME Challenge over DNS',
optional => 1,
},
};
PVE::JSONSchema::register_format('pve-acme-additional-node-conf', $acme_additional_desc);
my $acmedesc = { my $acmedesc = {
account => get_standard_option('pve-acme-account-name'), account => get_standard_option('pve-acme-account-name'),
domains => { domains => {
@ -84,6 +111,7 @@ my $acmedesc = {
format => 'pve-acme-domain-list', format => 'pve-acme-domain-list',
format_description => 'domain[;domain;...]', format_description => 'domain[;domain;...]',
description => 'List of domains for this node\'s ACME certificate', description => 'List of domains for this node\'s ACME certificate',
optional => 1,
}, },
}; };
PVE::JSONSchema::register_format('pve-acme-node-conf', $acmedesc); PVE::JSONSchema::register_format('pve-acme-node-conf', $acmedesc);
@ -95,6 +123,15 @@ $confdesc->{acme} = {
optional => 1, optional => 1,
}; };
for my $i (0..$MAXDOMAINS) {
$confdesc->{"acme_additional_domain$i"} = {
type => 'string',
description => 'ACME additional Domain',
format => $acme_additional_desc,
optional => 1,
};
};
sub check_type { sub check_type {
my ($key, $value) = @_; my ($key, $value) = @_;
@ -214,6 +251,7 @@ sub print_acme {
} }
sub get_nodeconfig_schema { sub get_nodeconfig_schema {
return $confdesc; return $confdesc;
} }