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 #418 from cmurphy/rspec
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
params.pp
diff --git
a/manifests/params.pp
b/manifests/params.pp
index d33a401fe6df214ff93c85bccb83635ed7e27e1b..1c6cc99de792a072e818497a9dd0b82c1f759ead 100644
(file)
--- a/
manifests/params.pp
+++ b/
manifests/params.pp
@@
-45,7
+45,8
@@
class apt::params {
'wheezy': {
$backports_location = 'http://ftp.debian.org/debian/'
$legacy_origin = false
'wheezy': {
$backports_location = 'http://ftp.debian.org/debian/'
$legacy_origin = false
- $origins = ['origin=Debian,archive=stable,label=Debian-Security']
+ $origins = ['origin=Debian,archive=stable,label=Debian-Security',
+ 'origin=Debian,archive=oldstable,label=Debian-Security']
}
default: {
$backports_location = 'http://http.debian.net/debian/'
}
default: {
$backports_location = 'http://http.debian.net/debian/'
@@
-62,7
+63,7
@@
class apt::params {
$legacy_origin = true
$origins = ['${distro_id} ${distro_codename}-security'] #lint:ignore:single_quote_string_with_variables
}
$legacy_origin = true
$origins = ['${distro_id} ${distro_codename}-security'] #lint:ignore:single_quote_string_with_variables
}
- 'precise', 'trusty': {
+ 'precise', 'trusty'
, 'utopic', 'vivid'
: {
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
$ppa_options = '-y'
$legacy_origin = true
$backports_location = 'http://us.archive.ubuntu.com/ubuntu'
$ppa_options = '-y'
$legacy_origin = true