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
Add a 'direct' option to proxy settings
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
setting.pp
diff --git
a/manifests/setting.pp
b/manifests/setting.pp
index 99549e6769842e747083c0561c2fcae0993538b9..91835cb1b2b88f15387b276660e50a26828bed91 100644
(file)
--- a/
manifests/setting.pp
+++ b/
manifests/setting.pp
@@
-1,14
+1,11
@@
define apt::setting (
define apt::setting (
- $type,
- $priority = 50,
- $ensure = file,
- $source = undef,
- $content = undef,
- $file_perms = {},
+ Variant[String, Integer, Array] $priority = 50,
+ Optional[Enum['file', 'present', 'absent']] $ensure = file,
+ Optional[String] $source = undef,
+ Optional[String] $content = undef,
+ Boolean $notify_update = true,
) {
) {
- $_file = merge($::apt::file_defaults, $file_perms)
-
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,36
+14,43
@@
define apt::setting (
fail('apt::setting needs either of content or source')
}
fail('apt::setting needs either of content or source')
}
- validate_re($type, ['conf', 'pref', 'list'])
- validate_re($ensure, ['file', 'present', 'absent'])
-
- unless is_integer($priority) {
- fail('apt::setting priority must be an integer')
- }
+ $title_array = split($title, '-')
+ $setting_type = $title_array[0]
+ $base_name = join(delete_at($title_array, 0), '-')
-
if $source
{
-
validate_string($source
)
+
assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/], $setting_type) |$a, $b|
{
+
fail("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'"
)
}
}
- if $content {
- validate_string($content)
+ if $priority !~ Integer {
+ # need this to allow zero-padded priority.
+ assert_type(Pattern[/^\d+$/], $priority) |$a, $b| {
+ fail('apt::setting priority must be an integer or a zero-padded integer')
+ }
}
}
- if
$type == 'list'
{
+ if
($setting_type == 'list') or ($setting_type == 'pref')
{
$_priority = ''
} else {
$_priority = $priority
}
$_priority = ''
} else {
$_priority = $priority
}
- $_path = $::apt::config_files[$type]['path']
- $_ext = $::apt::config_files[$type]['ext']
+ $_path = $::apt::config_files[$setting_type]['path']
+ $_ext = $::apt::config_files[$setting_type]['ext']
+
+ if $notify_update {
+ $_notify = Class['apt::update']
+ } else {
+ $_notify = undef
+ }
- file { "${_path}/${_priority}${
titl
e}${_ext}":
+ file { "${_path}/${_priority}${
base_nam
e}${_ext}":
ensure => $ensure,
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,
}
}
}
}