proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-27 13:45:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pveceph: use LWP instead of wget

Browse Source 
Avoid bug in wget certificate verification on Debian wheezy.
This commit is contained in:
Dietmar Maurer 2015-02-13 08:56:26 +01:00
parent 3af3f22143
commit 872c529b08
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bin/pveceph
View File

@ -8,6 +8,7 @@ use File::Path;
use IO::File;
use JSON;
use Data::Dumper;
use LWP::UserAgent;
use PVE::SafeSyslog;
use PVE::Cluster;
@ -102,9 +103,27 @@ __PACKAGE__->register_method ({
my $keyurl = "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc";
print "download and import ceph reqpository keys\n";
system("wget -q -O- '$keyurl'| apt-key add - 2>&1 >/dev/null") == 0 ||
# Note: wget on Debian wheezy cannot handle new ceph.com certificates, so
# we use LWP::UserAgent
#system("wget -q -O- '$keyurl'| apt-key add - 2>&1 >/dev/null") == 0 ||
#die "unable to download ceph release key\n";
my $tmp_key_file = "/tmp/ceph-release-keys.asc";
my $ua = LWP::UserAgent->new(protocols_allowed => ['https'], timeout => 30);
$ua->env_proxy;
my $response = $ua->get($keyurl);
if ($response->is_success) {
my $data = $response->decoded_content;
PVE::Tools::file_set_contents($tmp_key_file, $data);
} else {
die "unable to download ceph release key: " . $response->status_line . "\n";
}
system("apt-key add $tmp_key_file 2>&1 >/dev/null") == 0 ||
die "unable to download ceph release key\n";
unlink $tmp_key_file;
my $source = "deb http://ceph.com/debian-$cephver wheezy main\n";