Make apt::setting notify Exec['apt_update'] by default

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

diff --git a/manifests/source.pp b/manifests/source.pp
index f3fc7b995aa91c3f9c881b2a53302772dc045ab0..b7d150c2233b8448710f7690315606e9bef4e461 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,69 +1,55 @@
 # source.pp
 # add an apt source
-
 define apt::source(
+  $comment           = $name,
   $ensure            = present,
   $location          = '',
-  $release           = $lsbdistcodename,
+  $release           = $::lsbdistcodename,
   $repos             = 'main',
-  $include_src       = true,
-  $required_packages = false,
-  $key               = false,
+  $include_src       = false,
+  $include_deb       = true,
+  $key               = undef,
   $key_server        = 'keyserver.ubuntu.com',
-  $key_content       = false,
-  $key_source        = false,
-  $pin               = false
+  $key_content       = undef,
+  $key_source        = undef,
+  $pin               = false,
+  $architecture      = undef,
+  $trusted_source    = false,
 ) {
+  validate_string($architecture, $comment, $location, $release, $repos, $key_server)
+  validate_bool($trusted_source, $include_src, $include_deb)
 
-  include apt::params
-  include apt::update
-
-  $sources_list_d = $apt::params::sources_list_d
-  $provider       = $apt::params::provider
-
-  if $release == undef {
+  if ! $release {
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
-  file { "${name}.list":
+  apt::setting { "list-${name}":
     ensure  => $ensure,
-    path    => "${sources_list_d}/${name}.list",
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => template("${module_name}/source.list.erb"),
-    notify  => Exec['apt_update'],
+    content => template('apt/_header.erb', 'apt/source.list.erb'),
   }
 
-  if ($pin != false) and ($ensure == 'present') {
-    apt::pin { $release:
-      priority => $pin,
-      before   => File["${name}.list"]
-    }
-  }
+  if ($pin != false) {
+    # Get the host portion out of the url so we can pin to origin
+    $url_split = split($location, '/')
+    $host      = $url_split[2]
 
-  if ($required_packages != false) and ($ensure == 'present') {
-    exec { "Required packages: '${required_packages}' for ${name}":
-      command     => "${provider} -y install ${required_packages}",
-      subscribe   => File["${name}.list"],
-      refreshonly => true,
+    apt::pin { $name:
+      ensure   => $ensure,
+      priority => $pin,
+      before   => Apt::Setting["list-${name}"],
+      origin   => $host,
     }
   }
 
   # We do not want to remove keys when the source is absent.
-  if ($key != false) and ($ensure == 'present') {
+  if $key and ($ensure == 'present') {
     apt::key { "Add key: ${key} from Apt::Source ${title}":
       ensure      => present,
       key         => $key,
       key_server  => $key_server,
       key_content => $key_content,
       key_source  => $key_source,
-      before      => File["${name}.list"],
+      before      => Apt::Setting["list-${name}"],
     }
   }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::source::${name}":
-    require => Class['apt::update'],
-  }
 }