tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed http_proxy handling in apt::repo

Browse source
This commit is contained in:
Ossi Salmi 2011-03-09 14:02:43 +02:00 • committed by Timo Mkinen
parent bbf8ad0750
commit 0d25368ce7
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apt/manifests/init.pp
View file

@ -228,6 +228,12 @@ define apt::repo($source, $dist="", $components="main", $key="", $keyserver="",
$source_real = $source $source_real = $source
} }
if $http_proxy and $use_proxy {
$http_proxy_real = $http_proxy
} else {
$http_proxy_real = ""
}
if $use_source { if $use_source {
$content = "deb ${source_real} ${dist_real} ${components}\ndeb-src ${source_real} ${dist_real} ${components}\n" $content = "deb ${source_real} ${dist_real} ${components}\ndeb-src ${source_real} ${dist_real} ${components}\n"
} else { } else {
@ -254,9 +260,9 @@ define apt::repo($source, $dist="", $components="main", $key="", $keyserver="",
} }
exec { "apt-key-add-${key}": exec { "apt-key-add-${key}":
environment => $http_proxy ? { environment => $http_proxy_real ? {
"" => undef, "" => undef,
default => "http_proxy=${http_proxy}", default => "http_proxy=${http_proxy_real}",
}, },
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => $command, command => $command,