Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #227 from daniellawrence/file_perms_apt_ppa
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
params.pp
diff --git
a/manifests/params.pp
b/manifests/params.pp
index c9d0344bcb02450c6cd210c192481ded988c9de4..b35bb1c8d91b0a667d2fbb3a2ae986628db86261 100644
(file)
--- a/
manifests/params.pp
+++ b/
manifests/params.pp
@@
-15,19
+15,28
@@
class apt::params {
$backports_location = 'http://ftp.debian.org/debian/'
}
default: {
$backports_location = 'http://ftp.debian.org/debian/'
}
default: {
- $backports_location = 'http://
ftp.debian.org
/debian/'
+ $backports_location = 'http://
http.debian.net
/debian/'
}
}
}
'ubuntu': {
case $::lsbdistcodename {
}
}
}
'ubuntu': {
case $::lsbdistcodename {
- 'hardy','lucid','maverick','natty','oneiric','precise': {
+ 'hardy','maverick','natty','oneiric','precise': {
+ $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
+ $ppa_options = '-y'
+ }
+ 'lucid': {
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
+ $ppa_options = undef
}
default: {
$backports_location = 'http://old-releases.ubuntu.com/ubuntu'
}
default: {
$backports_location = 'http://old-releases.ubuntu.com/ubuntu'
+ $ppa_options = '-y'
}
}
}
}
}
}
+ default: {
+ fail("Unsupported osfamily (${::osfamily}) or lsbdistid (${::lsbdistid})")
+ }
}
}
}
}