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 9f31fe91308bbb911b5013a21227b17e4f0e11db..b7d150c2233b8448710f7690315606e9bef4e461 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,61 +1,55 @@
 # source.pp
 # add an apt source
-
 define apt::source(
-  $location = '',
-  $release = 'karmic',
-  $repos = 'main',
-  $include_src = true,
-  $required_packages = false,
-  $key = false,
-  $key_server = 'keyserver.ubuntu.com',
-  $pin = false,
-  $key_content = false
+  $comment           = $name,
+  $ensure            = present,
+  $location          = '',
+  $release           = $::lsbdistcodename,
+  $repos             = 'main',
+  $include_src       = false,
+  $include_deb       = true,
+  $key               = undef,
+  $key_server        = 'keyserver.ubuntu.com',
+  $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
-
-  file { "${name}.list":
-    path => "${apt::params::root}/sources.list.d/${name}.list",
-    ensure => file,
-    owner => root,
-    group => root,
-    mode => 644,
-    content => template("apt/source.list.erb"),
-
+  if ! $release {
+    fail('lsbdistcodename fact not available: release parameter required')
   }
 
-  if $pin != false {
-    apt::pin { "${release}": priority => "${pin}" } -> File["${name}.list"]
+  apt::setting { "list-${name}":
+    ensure  => $ensure,
+    content => template('apt/_header.erb', 'apt/source.list.erb'),
   }
 
-  exec { "${name} apt update":
-    command => "${apt::params::provider} update",
-    subscribe => File["${name}.list"],
-    refreshonly => true,
-  }
+  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 {
-    exec { "Required packages: '${required_packages}' for ${name}":
-      command     => "${apt::params::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,
     }
   }
 
-  if $key != false {
-    if $key_content {
-      exec { "Add key: ${key} from content for ${name}":
-        command => "/bin/echo '${key_content}' | /usr/bin/apt-key add -",
-        unless => "/usr/bin/apt-key list | /bin/grep '${key}'",
-        before => File["${name}.list"],
-      }
-    } else {
-      exec { "Add key: ${key} from ${key_server} for ${name}":
-        command => "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}",
-        unless => "/usr/bin/apt-key list | /bin/grep ${key}",
-        before => File["${name}.list"],
-      }
+  # We do not want to remove keys when the source is absent.
+  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      => Apt::Setting["list-${name}"],
     }
   }
 }