Merge pull request #439 from mhaskel/rspec3

[puppet-modules/puppetlabs-apt.git] / manifests / conf.pp

diff --git a/manifests/conf.pp b/manifests/conf.pp
index 03aab8e00270fb40ca699d1e4e286a8dd949bb71..08159379e7d017fa33853c4cdca1b9c9ef1e3778 100644 (file)
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -1,16 +1,12 @@
 define apt::conf (
+  $content,
   $ensure   = present,
-  $priority = '50',
-  $content
+  $priority = '50'
 ) {
 
-  include apt::params
-
-  $apt_conf_d = $apt::params::apt_conf_d
-
-  file { "${apt_conf_d}/${priority}${name}":
+  file { "${apt::conf_d}/${priority}${name}":
     ensure  => $ensure,
-    content => $content,
+    content => template('apt/_header.erb', 'apt/conf.erb'),
     owner   => root,
     group   => root,
     mode    => '0644',