From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dietmar@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id C282B7AA1E
for <pbs-devel@lists.proxmox.com>; Mon, 10 May 2021 08:51:07 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B7A8913B4A
for <pbs-devel@lists.proxmox.com>; Mon, 10 May 2021 08:51:07 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id F0DBB13AF9
for <pbs-devel@lists.proxmox.com>; Mon, 10 May 2021 08:51:06 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C4A4742DEC
for <pbs-devel@lists.proxmox.com>; Mon, 10 May 2021 08:51:06 +0200 (CEST)
Date: Mon, 10 May 2021 08:50:47 +0200 (CEST)
From: Dietmar Maurer <dietmar@proxmox.com>
To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>,
Dylan Whyte <d.whyte@proxmox.com>
Message-ID: <488613269.1090.1620629447249@webmail.proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-Priority: 3
Importance: Normal
X-Mailer: Open-Xchange Mailer v7.10.5-Rev10
X-Originating-Client: open-xchange-appsuite
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.228 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: Re: [pbs-devel] [PATCH proxmox-backup 3/4] fix #3296: use proxy for
subscriptions
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2021 06:51:07 -0000
Ignore me - I can fix this myself easily (no need to resend).
> On 05/10/2021 8:44 AM Dietmar Maurer <dietmar@proxmox.com> wrote:
>
>
> This one does not apply. Please can you rebase an d send it again.
>
> On 5/7/21 12:53 PM, Dylan Whyte wrote:
> > Signed-off-by: Dylan Whyte <d.whyte@proxmox.com>
> > ---
> > src/tools/subscription.rs | 9 ++++++++-
> > 1 file changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/tools/subscription.rs b/src/tools/subscription.rs
> > index eaaf0389..55b89387 100644
> > --- a/src/tools/subscription.rs
> > +++ b/src/tools/subscription.rs
> > @@ -6,6 +6,7 @@ use regex::Regex;
> >
> > use proxmox::api::api;
> >
> > +use crate::config::node;
> > use crate::tools::{self, http::SimpleHttp};
> > use proxmox::tools::fs::{replace_file, CreateOptions};
> >
> > @@ -102,7 +103,13 @@ async fn register_subscription(
> > "check_token": challenge,
> > });
> >
> > - let mut client = SimpleHttp::new(None); // TODO: pass proxy_config
> > + let proxy_config = if let Ok((node_config, _digest)) = node::config() {
> > + node_config.http_proxy()
> > + } else {
> > + None
> > + };
> > +
> > + let mut client = SimpleHttp::new(proxy_config);
> >
> > let uri = "https://shop.maurer-it.com/modules/servers/licensing/verify.php";
> > let query = tools::json_object_to_query(params)?;
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel