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

Added support for APT proxy

Browse source
This commit is contained in:
Ossi Salmi 2010-12-02 09:48:36 +02:00 • committed by Timo Mkinen
parent 2fa52b4a56
commit ad41895078
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apt/manifests/init.pp
View file

@ -134,6 +134,11 @@ define apt::package($ensure, $source) {
# Add apt repository. # Add apt repository.
# #
# === Global variables
#
# $apt_proxy:
# APT proxy host.
#
# === Parameters # === Parameters
# #
# $name: # $name:
@ -159,20 +164,26 @@ define apt::package($ensure, $source) {
# #
define apt::repo($source, $dist="", $components="main", $key="", $keyserver="") { define apt::repo($source, $dist="", $components="main", $key="", $keyserver="") {
include apt
if $dist { if $dist {
$dist_real = $dist $dist_real = $dist
} else { } else {
$dist_real = $lsbdistcodename $dist_real = $lsbdistcodename
} }
include apt if $apt_proxy {
$source_real = regsubst($source, "^([^:]+://)(.+)$", "\1$apt_proxy/\2")
} else {
$source_real = $source
}
file { "/etc/apt/sources.list.d/${name}.list": file { "/etc/apt/sources.list.d/${name}.list":
ensure => present, ensure => present,
mode => 0644, mode => 0644,
owner => root, owner => root,
group => root, group => root,
content => "deb ${source} ${dist_real} ${components}\ndeb-src ${source} ${dist_real} ${components}\n", content => "deb ${source_real} ${dist_real} ${components}\ndeb-src ${source_real} ${dist_real} ${components}\n",
notify => Exec["apt-get-update"], notify => Exec["apt-get-update"],
} }
@ -186,7 +197,7 @@ define apt::repo($source, $dist="", $components="main", $key="", $keyserver="")
} }
} }
exec { "apt-key-add": exec { "apt-key-add-${key}":
environment => $http_proxy ? { environment => $http_proxy ? {
"" => undef, "" => undef,
default => "http_proxy=${http_proxy}", default => "http_proxy=${http_proxy}",