From: Hunter Haugen <h.haugen@gmail.com>
Date: Tue, 2 Jul 2013 18:34:21 +0000 (-0700)
Subject: Merge pull request #122 from strangeman/master
X-Git-Tag: 1.2.0~6
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=add5060d643bba7c26e03a270365bdbf21d28283;hp=-c;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #122 from strangeman/master

Add a $key_options parameter to apt::key.
---

add5060d643bba7c26e03a270365bdbf21d28283
diff --combined manifests/key.pp
index b14500e,a6ebf7b..c78bf65
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@@ -3,14 -3,13 +3,15 @@@ 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
  
    $upkey = upcase($key)
 +  # trim the key to the last 8 chars so we can match longer keys with apt-key list too
 +  $trimmedkey = regsubst($upkey, '^.*(.{8})$', '\1')
  
    if $key_content {
      $method = 'content'
@@@ -41,16 -40,23 +42,23 @@@
          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,
            path      => '/bin:/usr/bin',
 -          unless    => "/usr/bin/apt-key list | /bin/grep '${upkey}'",
 +          unless    => "/usr/bin/apt-key list | /bin/grep '${trimmedkey}'",
            logoutput => 'on_failure',
            before    => Anchor["apt::key ${upkey} present"],
          }
@@@ -68,7 -74,7 +76,7 @@@
        exec { "apt::key ${upkey} absent":
          command   => "apt-key del '${upkey}'",
          path      => '/bin:/usr/bin',
 -        onlyif    => "apt-key list | grep '${upkey}'",
 +        onlyif    => "apt-key list | grep '${trimmedkey}'",
          user      => 'root',
          group     => 'root',
          logoutput => 'on_failure',