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 #540 from szynaka/apt_conf_comments
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
conf.pp
diff --git
a/manifests/conf.pp
b/manifests/conf.pp
index 49e32abaaa256254fd0d144d0bfc0eeed9187cef..c0cd55ba9e145b4b2a01437d5903ce3467851d9d 100644
(file)
--- a/
manifests/conf.pp
+++ b/
manifests/conf.pp
@@
-1,13
+1,18
@@
define apt::conf (
define apt::conf (
- $content,
+ $content
= undef
,
$ensure = present,
$priority = '50',
) {
$ensure = present,
$priority = '50',
) {
+
+ unless $ensure == 'absent' {
+ unless $content {
+ fail('Need to pass in content parameter')
+ }
+ }
+
apt::setting { "conf-${name}":
apt::setting { "conf-${name}":
- ensure => $ensure,
- base_name => $name,
- setting_type => 'conf',
- priority => $priority,
- content => template('apt/_header.erb', 'apt/conf.erb'),
+ ensure => $ensure,
+ priority => $priority,
+ content => template('apt/_conf_header.erb', 'apt/conf.erb'),
}
}
}
}