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 6be1a67facd423c919615aea0c26997d57236021..318422e29323933eb2b8f3d315037e421d4d1a4c 100644 (file)
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -1,17 +1,18 @@
 define apt::conf (
-  $priority = '50',
-  $content
-  ) {
+  $content,
+  $ensure   = present,
+  $priority = '50'
+) {
 
   include apt::params
 
-  $root       = "${apt::params::root}"
-  $apt_conf_d = "${apt::params::apt_conf_d}"
+  $apt_conf_d = $apt::params::apt_conf_d
 
   file { "${apt_conf_d}/${priority}${name}":
-    content => $content,
+    ensure  => $ensure,
+    content => template('apt/_header.erb', 'apt/conf.erb'),
     owner   => root,
     group   => root,
-    mode    => 0644,
+    mode    => '0644',
   }
 }