(#12823) Add apt::key defined type and modify apt::source to use it

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

diff --git a/manifests/source.pp b/manifests/source.pp
index 7dee0a985f4fa96f10cf73a5efdb5f21c0e96688..475bee3bf04c4e9a069eb615df8cd28916a91296 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -2,48 +2,56 @@
 # 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
+  $location = '',
+  $release = 'karmic',
+  $repos = 'main',
+  $include_src = true,
+  $required_packages = false,
+  $key = false,
+  $key_server = 'keyserver.ubuntu.com',
+  $key_content = false,
+  $key_source  = false,
+  $pin = false
 ) {
 
-       file { "${name}.list":
-               ensure => file,
-               owner => root,
-               group => root,
-               mode => 644,
-               content => template("apt/source.list.erb"),
-       }
-
-       if $pin != false {
-               apt::pin { "${release}": priority => "${pin}" }
-       }
-
-       exec { "${name} apt update":
-               subscribe => File["${name}.list"],
-               refreshonly => true,
-       }
-
-       if $required_packages != false {
-                       subscribe => File["${name}.list"],
-                       refreshonly => true,
-               }
-       }
-
-       if $key != false {
-               exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}":
-                       unless => "/usr/bin/apt-key list | grep ${key}",
-                       before => File["${name}.list"],
-               }
-       }
   include apt::params
 
-    name => "${apt::params::root}/sources.list.d/${name}.list",
+  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 $pin != false {
+    apt::pin { "${release}": priority => "${pin}" } -> File["${name}.list"]
+  }
+
+  exec { "${name} apt update":
     command => "${apt::params::provider} update",
-    exec { "${apt::params::provider} -y install ${required_packages}":
+    subscribe => File["${name}.list"],
+    refreshonly => true,
+  }
+
+  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,
+    }
+  }
+
+  if $key != false {
+    apt::key { "Add key: ${key} from Apt::Source ${title}":
+      key         => $key,
+      ensure      => present,
+      key_server  => $key_server,
+      key_content => $key_content,
+      key_source  => $key_source,
+      before      => File["${name}.list"],
+    }
+  }
 }