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
Adds apt::{conf,backports} and variable style.
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
source.pp
diff --git
a/manifests/source.pp
b/manifests/source.pp
index 42a21e9e49c3293a80886a75c7dc67e4cb43e1d1..3d4011e26dda5bb352410bbc9d7720dfa3119737 100644
(file)
--- a/
manifests/source.pp
+++ b/
manifests/source.pp
@@
-16,32
+16,35
@@
define apt::source(
include apt::params
include apt::params
+ $sources_list_d = $apt::params::sources_list_d
+ $provider = $apt::params::provider
+
if $release == undef {
if $release == undef {
- fail(
"lsbdistcodename fact not available: release parameter required"
)
+ fail(
'lsbdistcodename fact not available: release parameter required'
)
}
file { "${name}.list":
}
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"),
+
ensure => file
,
+
path => "${apt::params::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
=> "${
provider} update",
+ subscribe
=> File["${name}.list"],
refreshonly => true,
}
if $required_packages != false {
exec { "Required packages: '${required_packages}' for ${name}":
refreshonly => true,
}
if $required_packages != false {
exec { "Required packages: '${required_packages}' for ${name}":
- command => "${
apt::params::
provider} -y install ${required_packages}",
+ command => "${provider} -y install ${required_packages}",
subscribe => File["${name}.list"],
refreshonly => true,
}
subscribe => File["${name}.list"],
refreshonly => true,
}
@@
-49,8
+52,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,