* [pve-devel] [PATCH manager] subscription: remove ceph APT auth if invalid
@ 2023-10-25 13:34 Fabian Grünbichler
2023-10-25 16:46 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Grünbichler @ 2023-10-25 13:34 UTC (permalink / raw)
To: pve-devel
like we do for the main APT auth file(s) in proxmox-subscription.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
PVE/API2/Subscription.pm | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/PVE/API2/Subscription.pm b/PVE/API2/Subscription.pm
index 7c1e300ba..836e7a86f 100644
--- a/PVE/API2/Subscription.pm
+++ b/PVE/API2/Subscription.pm
@@ -94,14 +94,18 @@ sub write_etc_subscription {
Proxmox::RS::Subscription::write_subscription(
$filename, "/etc/apt/auth.conf.d/pve.conf", "enterprise.proxmox.com/debian/pve", $info);
- # FIXME: improve this, especially the selection of valid ceph-releases
- # NOTE: currently we should add future ceph releases as early as possible, to ensure that
- my $ceph_auth = '';
- for my $ceph_release ('quincy', 'reef') {
- $ceph_auth .= "machine enterprise.proxmox.com/debian/ceph-${ceph_release}"
+ if (!(defined($info->{key}) && defined($info->{serverid}))) {
+ unlink "/etc/apt/auth.conf.d/ceph.conf";
+ } else {
+ # FIXME: improve this, especially the selection of valid ceph-releases
+ # NOTE: currently we should add future ceph releases as early as possible, to ensure that
+ my $ceph_auth = '';
+ for my $ceph_release ('quincy', 'reef') {
+ $ceph_auth .= "machine enterprise.proxmox.com/debian/ceph-${ceph_release}"
." login $info->{key} password $info->{serverid}\n"
+ }
+ PVE::Tools::file_set_contents("/etc/apt/auth.conf.d/ceph.conf", $ceph_auth);
}
- PVE::Tools::file_set_contents("/etc/apt/auth.conf.d/ceph.conf", $ceph_auth);
}
__PACKAGE__->register_method ({
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH manager] subscription: remove ceph APT auth if invalid
2023-10-25 13:34 [pve-devel] [PATCH manager] subscription: remove ceph APT auth if invalid Fabian Grünbichler
@ 2023-10-25 16:46 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2023-10-25 16:46 UTC (permalink / raw)
To: Proxmox VE development discussion, Fabian Grünbichler
Am 25/10/2023 um 15:34 schrieb Fabian Grünbichler:
> like we do for the main APT auth file(s) in proxmox-subscription.
>
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
> PVE/API2/Subscription.pm | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-25 16:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-25 13:34 [pve-devel] [PATCH manager] subscription: remove ceph APT auth if invalid Fabian Grünbichler
2023-10-25 16:46 ` [pve-devel] applied: " Thomas Lamprecht
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