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

Added options to disable proxy and source repository to apt::repo

Browse source
This commit is contained in:
Ossi Salmi 2010-12-26 19:37:52 +02:00 • committed by Timo Mkinen
parent b60ad68d08
commit d12a53d982
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apt/manifests/init.pp
View file

@ -163,6 +163,10 @@ define apt::package($ensure, $source) {
# GPG key id. # GPG key id.
# $keyserver: # $keyserver:
# GPG keyserver uri. # GPG keyserver uri.
# $use_proxy:
# Use apt proxy (if set). Defaults to true.
# $use_source:
# Use source packages. Defaults to false.
# #
# === Sample usage # === Sample usage
# #
@ -172,7 +176,7 @@ define apt::package($ensure, $source) {
# keyserver => "hkp://keys.gnupg.net", # keyserver => "hkp://keys.gnupg.net",
# } # }
# #
define apt::repo($source, $dist="", $components="main", $key="", $keyserver="") { define apt::repo($source, $dist="", $components="main", $key="", $keyserver="", $use_proxy=true, $use_source=false) {
include apt include apt
@ -182,18 +186,24 @@ define apt::repo($source, $dist="", $components="main", $key="", $keyserver="")
$dist_real = $lsbdistcodename $dist_real = $lsbdistcodename
} }
if $apt_proxy { if $apt_proxy and $use_proxy {
$source_real = regsubst($source, "^([^:]+://)(.+)$", "\\1$apt_proxy/\\2") $source_real = regsubst($source, "^([^:]+://)(.+)$", "\\1$apt_proxy/\\2")
} else { } else {
$source_real = $source $source_real = $source
} }
if $use_source {
$content = "deb ${source_real} ${dist_real} ${components}\ndeb-src ${source_real} ${dist_real} ${components}\n"
} else {
$content = "deb ${source_real} ${dist_real} ${components}\n"
}
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_real} ${dist_real} ${components}\ndeb-src ${source_real} ${dist_real} ${components}\n", content => $content,
notify => Exec["apt-get-update"], notify => Exec["apt-get-update"],
} }