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
and an acceptance test
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
source.pp
diff --git
a/manifests/source.pp
b/manifests/source.pp
index a859174a1aaef9296a74bc8ec8c6acd51d096f1a..f6647dfe76b1021e645871711d6a8e9a11b6af57 100644
(file)
--- a/
manifests/source.pp
+++ b/
manifests/source.pp
@@
-2,22
+2,29
@@
# add an apt source
define apt::source(
# add an apt source
define apt::source(
+ $comment = $name,
$ensure = present,
$location = '',
$release = 'UNDEF',
$repos = 'main',
$include_src = true,
$ensure = present,
$location = '',
$release = 'UNDEF',
$repos = 'main',
$include_src = true,
+ $include_deb = true,
$required_packages = false,
$required_packages = false,
- $key =
false
,
+ $key =
undef
,
$key_server = 'keyserver.ubuntu.com',
$key_server = 'keyserver.ubuntu.com',
- $key_content = false,
- $key_source = false,
- $pin = false
+ $key_content = undef,
+ $key_source = undef,
+ $pin = false,
+ $architecture = undef,
+ $trusted_source = false,
) {
include apt::params
include apt::update
) {
include apt::params
include apt::update
+ validate_string($architecture)
+ validate_bool($trusted_source)
+
$sources_list_d = $apt::params::sources_list_d
$provider = $apt::params::provider
$sources_list_d = $apt::params::sources_list_d
$provider = $apt::params::provider
@@
-37,7
+44,7
@@
define apt::source(
owner => root,
group => root,
mode => '0644',
owner => root,
group => root,
mode => '0644',
- content => template(
"${module_name}/source.list.erb"
),
+ content => template(
'apt/_header.erb', 'apt/source.list.erb'
),
notify => Exec['apt_update'],
}
notify => Exec['apt_update'],
}
@@
-60,12
+67,15
@@
define apt::source(
command => "${provider} -y install ${required_packages}",
logoutput => 'on_failure',
refreshonly => true,
command => "${provider} -y install ${required_packages}",
logoutput => 'on_failure',
refreshonly => true,
+ tries => 3,
+ try_sleep => 1,
subscribe => File["${name}.list"],
subscribe => File["${name}.list"],
+ before => Exec['apt_update'],
}
}
# We do not want to remove keys when the source is absent.
}
}
# We do not want to remove keys when the source is absent.
- if
($key != false)
and ($ensure == 'present') {
+ if
$key
and ($ensure == 'present') {
apt::key { "Add key: ${key} from Apt::Source ${title}":
ensure => present,
key => $key,
apt::key { "Add key: ${key} from Apt::Source ${title}":
ensure => present,
key => $key,