From: Jonas Theisen <j.theisen@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-manager v3 1/2] fix #8031: factor out APT proxy write from update_database call
Date: Tue, 15 Sep 2026 11:16:57 +0200 [thread overview]
Message-ID: <20260915091758.85522-2-j.theisen@proxmox.com> (raw)
In-Reply-To: <20260915091758.85522-1-j.theisen@proxmox.com>
To allow reuse of the same function for the Cluster set_options call
this commit factors the function to write the APT proxy config file
out of the update_database call into a sub function.
Signed-off-by: Jonas Theisen <j.theisen@proxmox.com>
---
PVE/API2/APT.pm | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index 6dd4c261..87928e58 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -290,6 +290,19 @@ __PACKAGE__->register_method({
},
});
+sub update_apt_proxy_config {
+ my $dcconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
+ my $aptconf = "// no proxy configured\n";
+
+ if (my $http_proxy = $dcconf->{http_proxy}) {
+ my $http_proxy_uri = URI->new($http_proxy);
+ $aptconf = "Acquire::http::Proxy \"${http_proxy_uri}\";\n";
+ }
+ my $aptcfn = "/etc/apt/apt.conf.d/76pveproxy";
+
+ PVE::Tools::file_set_contents($aptcfn, $aptconf);
+}
+
__PACKAGE__->register_method({
name => 'update_database',
path => 'update',
@@ -334,15 +347,7 @@ __PACKAGE__->register_method({
my $realcmd = sub {
my $upid = shift;
- # setup proxy for apt
-
- my $aptconf = "// no proxy configured\n";
- if (my $http_proxy = $dcconf->{http_proxy}) {
- my $http_proxy_uri = URI->new($http_proxy);
- $aptconf = "Acquire::http::Proxy \"${http_proxy_uri}\";\n";
- }
- my $aptcfn = "/etc/apt/apt.conf.d/76pveproxy";
- PVE::Tools::file_set_contents($aptcfn, $aptconf);
+ update_apt_proxy_config();
my $cmd = ['apt-get', 'update'];
--
2.47.3
next prev parent reply other threads:[~2026-09-15 9:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-15 9:16 [PATCH pve-manager v3 0/2] fix #8031: write APT proxy config on http_proxy change Jonas Theisen
2026-09-15 9:16 ` Jonas Theisen [this message]
2026-09-15 9:16 ` [PATCH pve-manager v3 2/2] " Jonas Theisen
2026-09-16 9:32 ` [PATCH pve-manager v3 0/2] " Maximiliano Sandoval
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260915091758.85522-2-j.theisen@proxmox.com \
--to=j.theisen@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox