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
(MODULES-3983) Update parallel_tests for ruby 2.0.0
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
setting.pp
diff --git
a/manifests/setting.pp
b/manifests/setting.pp
index f6f0bc0c2275821a3656d9e14cb73b30f1202f88..b0fb62b1debd8fb5d90c1f86cb0f0bdc5e778a7f 100644
(file)
--- a/
manifests/setting.pp
+++ b/
manifests/setting.pp
@@
-1,13
+1,12
@@
define apt::setting (
define apt::setting (
- $priority = 50,
- $ensure = file,
- $source = undef,
- $content = undef,
- $
file_perms = {}
,
+ $priority
= 50,
+ $ensure
= file,
+ $source
= undef,
+ $content
= undef,
+ $
notify_update = true
,
) {
) {
- $_file = merge($::apt::file_defaults, $file_perms)
-
+ include 'apt::params'
if $content and $source {
fail('apt::setting cannot have both content and source')
}
if $content and $source {
fail('apt::setting cannot have both content and source')
}
@@
-17,6
+16,7
@@
define apt::setting (
}
validate_re($ensure, ['file', 'present', 'absent'])
}
validate_re($ensure, ['file', 'present', 'absent'])
+ validate_bool($notify_update)
$title_array = split($title, '-')
$setting_type = $title_array[0]
$title_array = split($title, '-')
$setting_type = $title_array[0]
@@
-37,21
+37,28
@@
define apt::setting (
validate_string($content)
}
validate_string($content)
}
- if
$setting_type == 'list'
{
+ if
($setting_type == 'list') or ($setting_type == 'pref')
{
$_priority = ''
} else {
$_priority = $priority
}
$_priority = ''
} else {
$_priority = $priority
}
- $_path = $::apt::config_files[$setting_type]['path']
- $_ext = $::apt::config_files[$setting_type]['ext']
+ $_path = $::apt::params::config_files[$setting_type]['path']
+ $_ext = $::apt::params::config_files[$setting_type]['ext']
+
+ if $notify_update {
+ $_notify = Class['apt::update']
+ } else {
+ $_notify = undef
+ }
file { "${_path}/${_priority}${base_name}${_ext}":
ensure => $ensure,
file { "${_path}/${_priority}${base_name}${_ext}":
ensure => $ensure,
- owner =>
$_file['owner']
,
- group =>
$_file['group']
,
- mode =>
$_file['mode']
,
+ owner =>
'root'
,
+ group =>
'root'
,
+ mode =>
'0644'
,
content => $content,
source => $source,
content => $content,
source => $source,
+ notify => $_notify,
}
}
}
}