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
Merge pull request #732 from willmeek/release_4_4_1
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
conf.pp
diff --git
a/manifests/conf.pp
b/manifests/conf.pp
index c0cd55ba9e145b4b2a01437d5903ce3467851d9d..eea06861d9e3793e807a9e77d5388d0897941d3c 100644
(file)
--- a/
manifests/conf.pp
+++ b/
manifests/conf.pp
@@
-1,7
+1,8
@@
define apt::conf (
define apt::conf (
- $content = undef,
- $ensure = present,
- $priority = '50',
+ Optional[String] $content = undef,
+ Enum['present', 'absent'] $ensure = present,
+ Variant[String, Integer] $priority = 50,
+ Optional[Boolean] $notify_update = undef,
) {
unless $ensure == 'absent' {
) {
unless $ensure == 'absent' {
@@
-10,9
+11,11
@@
define apt::conf (
}
}
}
}
+ $confheadertmp = epp('apt/_conf_header.epp')
apt::setting { "conf-${name}":
apt::setting { "conf-${name}":
- ensure => $ensure,
- priority => $priority,
- content => template('apt/_conf_header.erb', 'apt/conf.erb'),
+ ensure => $ensure,
+ priority => $priority,
+ content => "${confheadertmp}${content}",
+ notify_update => $notify_update,
}
}
}
}