X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fconf.pp;h=da6d64e738ba8269a053ade34567c3d15624b61a;hb=b55dd49b17cc7f5bdc42404e98141d46fe7ddce2;hp=03aab8e00270fb40ca699d1e4e286a8dd949bb71;hpb=a840dd8372d8a89dd0dab0f8b41ade29a77761da;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/conf.pp b/manifests/conf.pp
index 03aab8e..da6d64e 100644
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -1,18 +1,18 @@
 define apt::conf (
+  $content  = undef,
   $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/_header.erb', 'apt/conf.erb'),
   }
 }