acme: fix account parsing

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/PVE/API2/ACME.pm b/PVE/API2/ACME.pm
index d215739b021f5cf68b4b02171db3be0d506fb82c..c116712d0d0195e10d756b25be3810ca030fecf6 100644 (file)
--- 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 ae2f916cd5dffb3596f9ec8d63b4c5d00d7e3c21..ec70e7f355b96997166a6783e6f513c10948b682 100644 (file)
--- 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) {