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 #122 from strangeman/master
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
backports.pp
diff --git
a/manifests/backports.pp
b/manifests/backports.pp
index 152689055c70569dd1ca9aabb1e5c1c937d47324..e9180c48c22a80c69ff699e076ca482a46f621dd 100644
(file)
--- a/
manifests/backports.pp
+++ b/
manifests/backports.pp
@@
-16,31
+16,33
@@
#
# == Authors
#
#
# == Authors
#
-# Ben Hughes, I think. At least blame him if this goes wrong. I just added puppet doc.
+# Ben Hughes, I think. At least blame him if this goes wrong.
+# I just added puppet doc.
#
# == Copyright
#
# Copyright 2011 Puppet Labs Inc, unless otherwise noted.
class apt::backports(
#
# == Copyright
#
# Copyright 2011 Puppet Labs Inc, unless otherwise noted.
class apt::backports(
- $release = $lsbdistcodename,
+ $release = $
::
lsbdistcodename,
$location = $apt::params::backports_location
) inherits apt::params {
$release_real = downcase($release)
$location = $apt::params::backports_location
) inherits apt::params {
$release_real = downcase($release)
+ $key = $::lsbdistid ? {
+ 'debian' => '55BE302B',
+ 'ubuntu' => '437D05B5',
+ }
+ $repos = $::lsbdistid ? {
+ 'debian' => 'main contrib non-free',
+ 'ubuntu' => 'main universe multiverse restricted',
+ }
- apt::source { 'backports
.list
':
+ apt::source { 'backports':
location => $location,
release => "${release_real}-backports",
location => $location,
release => "${release_real}-backports",
- repos => $lsbdistid ? {
- 'debian' => 'main contrib non-free',
- 'ubuntu' => 'universe multiverse restricted',
- },
- key => $lsbdistid ? {
- 'debian' => '55BE302B',
- 'ubuntu' => '437D05B5',
- },
+ repos => $repos,
+ key => $key,
key_server => 'pgp.mit.edu',
pin => '200',
key_server => 'pgp.mit.edu',
pin => '200',
- notify => Exec["apt_update"],
}
}
}
}