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
(#14138) Modify apt::ppa's update-apt exec to use the ${apt::params::provider} parame...
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
source.pp
diff --git
a/manifests/source.pp
b/manifests/source.pp
index 475bee3bf04c4e9a069eb615df8cd28916a91296..95768dcfaa81f919d781294223e286cb1e72ae35 100644
(file)
--- a/
manifests/source.pp
+++ b/
manifests/source.pp
@@
-3,7
+3,7
@@
define apt::source(
$location = '',
define apt::source(
$location = '',
- $release =
'karmic'
,
+ $release =
$lsbdistcodename
,
$repos = 'main',
$include_src = true,
$required_packages = false,
$repos = 'main',
$include_src = true,
$required_packages = false,
@@
-16,23
+16,26
@@
define apt::source(
include apt::params
include apt::params
- file { "${name}.list":
- path => "${apt::params::root}/sources.list.d/${name}.list",
- ensure => file,
- owner => root,
- group => root,
- mode => 644,
- content => template("apt/source.list.erb"),
+ if $release == undef {
+ fail('lsbdistcodename fact not available: release parameter required')
+ }
+ file { "${name}.list":
+ ensure => file,
+ path => "${apt::params::root}/sources.list.d/${name}.list",
+ owner => root,
+ group => root,
+ mode => '0644',
+ content => template("${module_name}/source.list.erb"),
}
if $pin != false {
}
if $pin != false {
- apt::pin {
"${release}": priority => "${pin}"
} -> File["${name}.list"]
+ apt::pin {
$release: priority => $pin
} -> File["${name}.list"]
}
exec { "${name} apt update":
}
exec { "${name} apt update":
- command => "${apt::params::provider} update",
- subscribe => File["${name}.list"],
+ command
=> "${apt::params::provider} update",
+ subscribe
=> File["${name}.list"],
refreshonly => true,
}
refreshonly => true,
}
@@
-46,8
+49,8
@@
define apt::source(
if $key != false {
apt::key { "Add key: ${key} from Apt::Source ${title}":
if $key != false {
apt::key { "Add key: ${key} from Apt::Source ${title}":
- key => $key,
ensure => present,
ensure => present,
+ key => $key,
key_server => $key_server,
key_content => $key_content,
key_source => $key_source,
key_server => $key_server,
key_content => $key_content,
key_source => $key_source,