Merge pull request #46 from nanliu/master

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

diff --git a/manifests/source.pp b/manifests/source.pp
index 9f31fe91308bbb911b5013a21227b17e4f0e11db..999ff68bf93d8c1f16395ae2f64333d68d9b4bbd 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -3,35 +3,42 @@
 
 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,
-  $key_content = false
+  $key_content = false,
+  $key_source  = false,
+  $pin = false
 ) {
 
   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 == undef {
+    fail('lsbdistcodename fact not available: release parameter required')
+  }
 
+  file { "${name}.list":
+    ensure  => file,
+    path    => "${apt::params::root}/sources.list.d/${name}.list",
+    owner   => root,
+    group   => root,
+    mode    => '0644',
+    content => template("${module_name}/source.list.erb"),
   }
 
   if $pin != false {
-    apt::pin { "${release}": priority => "${pin}" } -> File["${name}.list"]
+    apt::pin { $release:
+      priority => $pin,
+      before   => File["${name}.list"]
+    }
   }
 
   exec { "${name} apt update":
-    command => "${apt::params::provider} update",
-    subscribe => File["${name}.list"],
+    command     => "${apt::params::provider} update",
+    subscribe   => File["${name}.list"],
     refreshonly => true,
   }
 
@@ -44,18 +51,13 @@ define apt::source(
   }
 
   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"],
-      }
+    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"],
     }
   }
 }