Merge pull request #27 from blkperl/ticket_12809_refactor_release

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

diff --git a/manifests/source.pp b/manifests/source.pp
index b6e8476b4cff5b33fa4780dff45d4cf2a181ec00..abc77e222bad886291a36dcc87d353fbe815512f 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -3,29 +3,34 @@
 
 define apt::source(
   $location = '',
-  $release = 'karmic',
+  $release = $lsbdistcodename,
   $repos = 'main',
   $include_src = true,
   $required_packages = false,
   $key = false,
   $key_server = 'keyserver.ubuntu.com',
-  $pin = false
+  $pin = false,
+  $key_content = false
 ) {
 
   include apt::params
 
+  if ! $release {
+    fail("lsbdistcodename fact not available: release parameter required")
+  }
 
   file { "${name}.list":
-    name => "${apt::params::root}/sources.list.d/${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}" }
+    apt::pin { "${release}": priority => "${pin}" } -> File["${name}.list"]
   }
 
   exec { "${name} apt update":
@@ -35,16 +40,26 @@ define apt::source(
   }
 
   if $required_packages != false {
-    exec { "${apt::params::provider} -y install ${required_packages}":
-      subscribe => File["${name}.list"],
+    exec { "Required packages: '${required_packages}' for ${name}":
+      command     => "${apt::params::provider} -y install ${required_packages}",
+      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"],
+    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"],
+      }
     }
   }
 }