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 #466 from paroga/master
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
conf.pp
diff --git
a/manifests/conf.pp
b/manifests/conf.pp
index 03aab8e00270fb40ca699d1e4e286a8dd949bb71..318422e29323933eb2b8f3d315037e421d4d1a4c 100644
(file)
--- a/
manifests/conf.pp
+++ b/
manifests/conf.pp
@@
-1,7
+1,7
@@
define apt::conf (
define apt::conf (
+ $content,
$ensure = present,
$ensure = present,
- $priority = '50',
- $content
+ $priority = '50'
) {
include apt::params
) {
include apt::params
@@
-10,7
+10,7
@@
define apt::conf (
file { "${apt_conf_d}/${priority}${name}":
ensure => $ensure,
file { "${apt_conf_d}/${priority}${name}":
ensure => $ensure,
- content =>
$content
,
+ content =>
template('apt/_header.erb', 'apt/conf.erb')
,
owner => root,
group => root,
mode => '0644',
owner => root,
group => root,
mode => '0644',