Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-apt

Conflicts:
	.travis.yml
	Modulefile

diff --git a/.travis.yml b/.travis.yml
index a19074d0b8412434d76d5d32f489c4210f9615e2..c825f5e4ed3da0d6556bfb48fc993923eab5b7d8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,12 @@ rvm:
   - 1.9.3
   - ruby-head
 env:
+<<<<<<< HEAD
+  - PUPPET_VERSION=3.0.1
+  - PUPPET_VERSION=2.7.13
+  - PUPPET_VERSION=2.7.6
+  - PUPPET_VERSION=2.6.9
+=======
   - PUPPET_GEM_VERSION="~> 2.6.0"
   - PUPPET_GEM_VERSION="~> 2.7.0"
   - PUPPET_GEM_VERSION="~> 3.0.0"
@@ -25,5 +31,6 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 2.6.0"
     - rvm: ruby-head
       env: PUPPET_GEM_VERSION="~> 2.6.0"
+>>>>>>> 18ee4cc6c9eb8d16becfec68254d8955eb10c7d5
 notifications:
   email: false

diff --git a/Modulefile b/Modulefile
index d3511424645f8a5a70447f370cdd7b13559f5c81..dbf3f2e209bc0234a190a27c328569003e94e88b 100644 (file)
--- a/Modulefile
+++ b/Modulefile
@@ -8,7 +8,11 @@ description 'APT Module for Puppet'
 project_page 'https://github.com/puppetlabs/puppetlabs-apt'
 
 ## Add dependencies, if any:
+<<<<<<< HEAD
+dependency 'puppetlabs/stdlib', '>= 3.0.1'
+=======
 #dependency 'puppetlabs/stdlib', '2.x'
 # The dependency should be written as above but librarian-puppet
 # does not support the expression as the PMT does.
 dependency 'puppetlabs/stdlib', '>= 2.2.1'
+>>>>>>> 18ee4cc6c9eb8d16becfec68254d8955eb10c7d5

diff --git a/manifests/key.pp b/manifests/key.pp
index 98a0f3a32c4b42192f33f6795689b3df939b24ea..a6ebf7bd37ef0273ea9f70ec0d1c64815e7ba6b1 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
@@ -39,11 +40,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\"",
 }