Merge pull request #666 from HelenCampbell/release

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

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