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 remote-tracking branch 'upstream/master' into merge_master_to_2.1.x
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
conf.pp
diff --git
a/manifests/conf.pp
b/manifests/conf.pp
index 03aab8e00270fb40ca699d1e4e286a8dd949bb71..c0cd55ba9e145b4b2a01437d5903ce3467851d9d 100644
(file)
--- a/
manifests/conf.pp
+++ b/
manifests/conf.pp
@@
-1,18
+1,18
@@
define apt::conf (
define apt::conf (
+ $content = undef,
$ensure = present,
$priority = '50',
$ensure = present,
$priority = '50',
- $content
) {
) {
- include apt::params
-
- $apt_conf_d = $apt::params::apt_conf_d
+ unless $ensure == 'absent' {
+ unless $content {
+ fail('Need to pass in content parameter')
+ }
+ }
- file { "${apt_conf_d}/${priority}${name}":
- ensure => $ensure,
- content => $content,
- owner => root,
- group => root,
- mode => '0644',
+ apt::setting { "conf-${name}":
+ ensure => $ensure,
+ priority => $priority,
+ content => template('apt/_conf_header.erb', 'apt/conf.erb'),
}
}
}
}