Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

pvenode: use print_api_result to print acme account information

Browse Source
This commit is contained in:
Dietmar Maurer 2018-07-26 10:54:04 +02:00
parent e3ca07b93f
commit e1f897ea84
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PVE/API2/ACMEAccount.pm
View File

@ -248,6 +248,7 @@ __PACKAGE__->register_method ({
account => {
type => 'object',
optional => 1,
renderer => 'yaml',
},
directory => get_standard_option('pve-acme-directory-url', {
optional => 1,

29
PVE/CLI/pvenode.pm
View File

@ -128,29 +128,6 @@ my $print_cert_info = sub {
$cert, $schema, $order, { %$options, noheader => 1, sort_key => 0 });
};
my $print_acme_account = sub {
my ($account) = @_;
print "Directory URL: $account->{directory}\n" if $account->{directory};
print "Account URL: $account->{location}\n" if $account->{location};
print "Terms Of Service: $account->{tos}\n" if $account->{tos};
my $data = $account->{account};
if ($data) {
print "\nAccount information:\n";
print "ID: $data->{id}\n" if $data->{id};
if ($data->{contact}) {
print "Contact:\n";
for my $contact (@{$data->{contact}}) {
print "\t- $contact\n";
}
}
print "Creation date: $data->{createdAt}\n" if $data->{createdAt};
print "Initial IP: $data->{initialIp}\n" if $data->{initialIp};
print "Status: $data->{status}\n" if $data->{status};
}
};
our $cmddef = {
config => {
get => [ 'PVE::API2::NodeConfig', 'get_config', [], { node => $nodename }, sub {
@ -222,7 +199,11 @@ our $cmddef = {
}],
register => [ __PACKAGE__, 'acme_register', ['name', 'contact'], {}, $upid_exit ],
deactivate => [ 'PVE::API2::ACMEAccount', 'deactivate_account', ['name'], {}, $upid_exit ],
info => [ 'PVE::API2::ACMEAccount', 'get_account', ['name'], {}, $print_acme_account],
info => [ 'PVE::API2::ACMEAccount', 'get_account', ['name'], {}, sub {
my ($data, $schema, $options) = @_;
PVE::CLIFormatter::query_terminal_options($options);
PVE::CLIFormatter::print_api_result($data, $schema, undef, $options);
}, $PVE::RESTHandler::standard_output_options],
update => [ 'PVE::API2::ACMEAccount', 'update_account', ['name'], {}, $upid_exit ],
},
cert => {