* [pmg-devel] [PATCH pmg-api] api: upload costum certificate: actually return info
@ 2021-04-28 8:22 Fabian Ebner
2021-04-28 9:13 ` [pmg-devel] applied: " Stoiko Ivanov
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Ebner @ 2021-04-28 8:22 UTC (permalink / raw)
To: pmg-devel
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
src/PMG/API2/Certificates.pm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/PMG/API2/Certificates.pm b/src/PMG/API2/Certificates.pm
index c08deb6..1db4a90 100644
--- a/src/PMG/API2/Certificates.pm
+++ b/src/PMG/API2/Certificates.pm
@@ -57,11 +57,13 @@ my sub update_cert : prototype($$$$$) {
my ($type, $cert_path, $certificate, $force, $restart) = @_;
my $code = sub {
print "Setting custom certificate file $cert_path\n";
- PMG::CertHelpers::set_cert_file($certificate, $cert_path, $force);
+ my $info = PMG::CertHelpers::set_cert_file($certificate, $cert_path, $force);
restart_after_cert_update($type) if $restart;
+
+ return $info;
};
- PMG::CertHelpers::cert_lock(10, $code);
+ return PMG::CertHelpers::cert_lock(10, $code);
};
my sub set_smtp : prototype($$) {
@@ -250,7 +252,7 @@ __PACKAGE__->register_method ({
my $info;
PMG::CertHelpers::cert_lock(10, sub {
- update_cert($type, $cert_path, $certs, $param->{force}, $param->{restart});
+ $info = update_cert($type, $cert_path, $certs, $param->{force}, $param->{restart});
});
if ($type eq 'smtp') {
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread* [pmg-devel] applied: [PATCH pmg-api] api: upload costum certificate: actually return info
2021-04-28 8:22 [pmg-devel] [PATCH pmg-api] api: upload costum certificate: actually return info Fabian Ebner
@ 2021-04-28 9:13 ` Stoiko Ivanov
0 siblings, 0 replies; 2+ messages in thread
From: Stoiko Ivanov @ 2021-04-28 9:13 UTC (permalink / raw)
To: Fabian Ebner; +Cc: pmg-devel
On Wed, 28 Apr 2021 10:22:50 +0200
Fabian Ebner <f.ebner@proxmox.com> wrote:
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> src/PMG/API2/Certificates.pm | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/src/PMG/API2/Certificates.pm b/src/PMG/API2/Certificates.pm
> index c08deb6..1db4a90 100644
> --- a/src/PMG/API2/Certificates.pm
> +++ b/src/PMG/API2/Certificates.pm
> @@ -57,11 +57,13 @@ my sub update_cert : prototype($$$$$) {
> my ($type, $cert_path, $certificate, $force, $restart) = @_;
> my $code = sub {
> print "Setting custom certificate file $cert_path\n";
> - PMG::CertHelpers::set_cert_file($certificate, $cert_path, $force);
> + my $info = PMG::CertHelpers::set_cert_file($certificate, $cert_path, $force);
>
> restart_after_cert_update($type) if $restart;
> +
> + return $info;
> };
> - PMG::CertHelpers::cert_lock(10, $code);
> + return PMG::CertHelpers::cert_lock(10, $code);
> };
>
> my sub set_smtp : prototype($$) {
> @@ -250,7 +252,7 @@ __PACKAGE__->register_method ({
> my $info;
>
> PMG::CertHelpers::cert_lock(10, sub {
> - update_cert($type, $cert_path, $certs, $param->{force}, $param->{restart});
> + $info = update_cert($type, $cert_path, $certs, $param->{force}, $param->{restart});
> });
>
> if ($type eq 'smtp') {
Huge thanks for tracking this down and providing the patch!!
gave it a quick spin and applied it
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-28 9:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-28 8:22 [pmg-devel] [PATCH pmg-api] api: upload costum certificate: actually return info Fabian Ebner
2021-04-28 9:13 ` [pmg-devel] applied: " Stoiko Ivanov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal