From a3a9f9e0ba3b2be4a1aaf04f3b081630a00063b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 16 Apr 2020 19:42:27 +0200 Subject: [PATCH] acme: fix account parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- PVE/API2/ACME.pm | 6 +++--- PVE/NodeConfig.pm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PVE/API2/ACME.pm b/PVE/API2/ACME.pm index d215739b..c116712d 100644 --- a/PVE/API2/ACME.pm +++ b/PVE/API2/ACME.pm @@ -223,7 +223,7 @@ __PACKAGE__->register_method ({ my $realcmd = sub { STDOUT->autoflush(1); - my $account = $acme_node_config->{account} // 'default'; + my $account = $acme_node_config->{account}; my $account_file = "${acme_account_dir}/${account}"; die "ACME account config file '$account' does not exist.\n" if ! -e $account_file; @@ -297,7 +297,7 @@ __PACKAGE__->register_method ({ my $realcmd = sub { STDOUT->autoflush(1); - my $account = $acme_node_config->{account} // 'default'; + my $account = $acme_node_config->{account}; my $account_file = "${acme_account_dir}/${account}"; die "ACME account config file '$account' does not exist.\n" if ! -e $account_file; @@ -361,7 +361,7 @@ __PACKAGE__->register_method ({ my $realcmd = sub { STDOUT->autoflush(1); - my $account = $acme_node_config->{account} // 'default'; + my $account = $acme_node_config->{account}; my $account_file = "${acme_account_dir}/${account}"; die "ACME account config file '$account' does not exist.\n" if ! -e $account_file; diff --git a/PVE/NodeConfig.pm b/PVE/NodeConfig.pm index ae2f916c..ec70e7f3 100644 --- a/PVE/NodeConfig.pm +++ b/PVE/NodeConfig.pm @@ -243,7 +243,7 @@ sub get_acme_conf { die $@; } } - $res->{0}->{account} = $res->{0}->{account} // "default"; + $res->{account} = delete $res->{0}->{account} // "default"; my $domainlist = []; for my $index (0..$MAXDOMAINS) {