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
Cleaned up unit tests.
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
params.pp
diff --git
a/manifests/params.pp
b/manifests/params.pp
index ae464436dadefdc3a451302ca5819db596f072ca..d57b80110c8209d4511a722120096a7ae721a4b2 100644
(file)
--- a/
manifests/params.pp
+++ b/
manifests/params.pp
@@
-10,30
+10,50
@@
class apt::params {
case $::lsbdistcodename {
'squeeze': {
$backports_location = 'http://backports.debian.org/debian-backports'
case $::lsbdistcodename {
'squeeze': {
$backports_location = 'http://backports.debian.org/debian-backports'
+ $legacy_origin = true
+ $origins = ['${distro_id} oldstable',
+ '${distro_id} ${distro_codename}-security',
+ '${distro_id} ${distro_codename}-lts']
}
'wheezy': {
$backports_location = 'http://ftp.debian.org/debian/'
}
'wheezy': {
$backports_location = 'http://ftp.debian.org/debian/'
+ $legacy_origin = false
+ $origins = ['origin=Debian,archive=stable,label=Debian-Security']
}
default: {
$backports_location = 'http://http.debian.net/debian/'
}
default: {
$backports_location = 'http://http.debian.net/debian/'
+ $legacy_origin = false
+ $origins = ['origin=Debian,archive=stable,label=Debian-Security']
}
}
}
'ubuntu': {
case $::lsbdistcodename {
}
}
}
'ubuntu': {
case $::lsbdistcodename {
- '
hardy','maverick','natty','oneiric','precise
': {
+ '
lucid
': {
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
- $ppa_options = 'y'
+ $ppa_options = undef
+ $legacy_origin = true
+ $origins = ['${distro_id} ${distro_codename}-security']
}
}
- '
lucid
': {
+ '
precise', 'trusty
': {
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
- $ppa_options = undef
+ $ppa_options = '-y'
+ $legacy_origin = true
+ $origins = ['${distro_id}:${distro_codename}-security']
}
default: {
$backports_location = 'http://old-releases.ubuntu.com/ubuntu'
}
default: {
$backports_location = 'http://old-releases.ubuntu.com/ubuntu'
- $ppa_options = 'y'
+ $ppa_options = '-y'
+ $legacy_origin = true
+ $origins = ['${distro_id}:${distro_codename}-security']
}
}
}
}
}
}
+ '': {
+ fail('Unable to determine lsbdistid, is lsb-release installed?')
+ }
+ default: {
+ fail("Unsupported lsbdistid (${::lsbdistid})")
+ }
}
}
}
}