Merge pull request #502 from mhaskel/merge_2.0.x_to_master

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

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