From: Jonas Theisen <j.theisen@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-mamager v4 1/3] api: apt: factor out writing the APT proxy config
Date: Mon, 12 Oct 2026 16:56:47 +0200 [thread overview]
Message-ID: <20261012145712.296002-2-j.theisen@proxmox.com> (raw)
In-Reply-To: <20261012145712.296002-1-j.theisen@proxmox.com>
Move writing the APT proxy config out of the update_database
endpoint into its own function, so that it can also be called when
the datacenter http_proxy option is changed.
The function takes the already parsed datacenter config, so callers
holding the datacenter.cfg lock can pass their updated copy.
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 93562b06..8e16b813 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) = @_;
+
+ 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($dcconf);
my $cmd = ['apt-get', 'update'];
--
2.47.3
next prev parent reply other threads:[~2026-10-12 14:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-12 14:56 [PATCH pve-mamager v4 0/3] fix #8031: Write APT proxy config on http_proxy change Jonas Theisen
2026-10-12 14:56 ` Jonas Theisen [this message]
2026-10-12 14:56 ` [PATCH pve-mamager v4 2/3] api: apt: move proxy config to pmxcfs and symlink to it Jonas Theisen
2026-10-12 16:33 ` Thomas Lamprecht
2026-10-12 14:56 ` [PATCH pve-mamager v4 3/3] fix #8031: api: cluster options: update APT proxy config on change Jonas Theisen
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=20261012145712.296002-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 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.