Merge pull request #452 from puppetlabs/daenney/rename-trusted-source

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

diff --git a/manifests/source.pp b/manifests/source.pp
index 0512fa96c9ac48440091843781d617ba9cf25cd9..96c174c05e2539e25066198f3a931e36ac22e6af 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,59 +1,75 @@
 # 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        = $::apt::xfacts['lsbdistcodename'],
+  $repos          = 'main',
+  $include        = {},
+  $key            = undef,
+  $pin            = false,
+  $architecture   = undef,
+  $allow_unsigned = false,
 ) {
+  validate_string($architecture, $comment, $location, $repos)
+  validate_bool($allow_unsigned)
+  validate_hash($include)
 
-  include apt::params
+  unless $release {
+    fail('lsbdistcodename fact not available: release parameter required')
+  }
 
-  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"),
+  $_before = Apt::Setting["list-${title}"]
+  $_include = merge($::apt::include_defaults, $include)
 
+  if $key {
+    if is_hash($key) {
+      unless $key['id'] {
+        fail('key hash must contain at least an id entry')
+      }
+      $_key = merge($::apt::source_key_defaults, $key)
+    } else {
+      validate_string($key)
+      $_key = $key
+    }
   }
 
-  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 { "${apt::params::provider} -y install ${required_packages}":
-      subscribe => File["${name}.list"],
-      refreshonly => true,
+    apt::pin { $name:
+      ensure   => $ensure,
+      priority => $pin,
+      before   => $_before,
+      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"],
+  # We do not want to remove keys when the source is absent.
+  if $key and ($ensure == 'present') {
+    if is_hash($_key) {
+      apt::key { "Add key: ${_key['id']} from Apt::Source ${title}":
+        ensure  => present,
+        id      => $_key['id'],
+        server  => $_key['server'],
+        content => $_key['content'],
+        source  => $_key['source'],
+        options => $_key['options'],
+        before  => $_before,
       }
     } 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"],
+      apt::key { "Add key: ${_key} from Apt::Source ${title}":
+        ensure => present,
+        id     => $_key,
+        before => $_before,
       }
     }
   }