Merge pull request #122 from strangeman/master

Add a $key_options parameter to apt::key.

diff --git a/manifests/key.pp b/manifests/key.pp
index b14500ed039db17ca3990435af036f1945c61893..c78bf658ce984a538aad7552ca3dd98581b3f29c 100644 (file)
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -3,7 +3,8 @@ define apt::key (
   $ensure = present,
   $key_content = false,
   $key_source = false,
-  $key_server = 'keyserver.ubuntu.com'
+  $key_server = 'keyserver.ubuntu.com',
+  $key_options = false
 ) {
 
   include apt::params
@@ -41,11 +42,18 @@ define apt::key (
         anchor { "apt::key ${upkey} present": }
       }
 
+      if $key_options{
+        $options_string = "--keyserver-options ${key_options}"
+      }
+      else{
+        $options_string = ''
+      }
+
       if !defined(Exec[$digest]) {
         $digest_command = $method ? {
           'content' => "echo '${key_content}' | /usr/bin/apt-key add -",
           'source'  => "wget -q '${key_source}' -O- | apt-key add -",
-          'server'  => "apt-key adv --keyserver '${key_server}' --recv-keys '${upkey}'",
+          'server'  => "apt-key adv --keyserver '${key_server}' ${options_string} --recv-keys '${upkey}'",
         }
         exec { $digest:
           command   => $digest_command,

diff --git a/tests/key.pp b/tests/key.pp
index 92679cf6be6e41a04b1bad1d0b820eeac026ce3a..cc90f909c091f2ee56700b6c91bcc3aae9a5ebea 100644 (file)
--- a/tests/key.pp
+++ b/tests/key.pp
@@ -2,4 +2,5 @@
 apt::key { 'puppetlabs':
   key        => '4BD6EC30',
   key_server => 'pgp.mit.edu',
+  key_options => "http-proxy=\"http://proxyuser:proxypass@example.org:3128\"",
 }