X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fconf.pp;h=c0cd55ba9e145b4b2a01437d5903ce3467851d9d;hb=bea5567ec2a2d5d1420f61a63d0e672693f6adcd;hp=3c4cb1975cb3551a1a642f2155111e0932a118e2;hpb=62d4557db613a745dd7f463df7c3b7a2df357754;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/conf.pp b/manifests/conf.pp
index 3c4cb19..c0cd55b 100644
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -1,18 +1,18 @@
 define apt::conf (
-  $content,
+  $content  = undef,
   $ensure   = present,
-  $priority = '50'
+  $priority = '50',
 ) {
 
-  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'),
   }
 }