Merge pull request #612 from 3flex/611-puppetlabs-apt-2-fixes

package/debian: support puppetlabs-apt 2.0.0
voxpupuli · Apr 29, 2015 · 6bf4b7b · 6bf4b7b
2 parents 031fb9d + ae8a60d
commit 6bf4b7b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp
@@ -37,24 +37,25 @@
           location   => "http://nginx.org/packages/${distro}",
           repos      => 'nginx',
           key        => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
-          key_source => 'http://nginx.org/keys/nginx_signing.key',
         }
       }
       'nginx-mainline': {
         apt::source { 'nginx':
           location   => "http://nginx.org/packages/mainline/${distro}",
           repos      => 'nginx',
           key        => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
-          key_source => 'http://nginx.org/keys/nginx_signing.key',
         }
       }
       'passenger': {
         apt::source { 'nginx':
           location          => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
           repos             => 'main',
           key               => '16378A33A6EF16762922526E561F9B9CAC40B2F7',
-          key_source        => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt',
-          required_packages => 'apt-transport-https ca-certificates',
+        }
+
+        package { ['apt-transport-https', 'ca-certificates']:
+          ensure => 'present',
+          before => Apt::Source['nginx'],
         }
 
         package { 'passenger':

diff --git a/metadata.json b/metadata.json
@@ -9,7 +9,7 @@
   "issues_url": "https://github.com/jfryman/puppet-nginx/issues",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.2.0 <5.0.0"},
-    {"name":"puppetlabs/apt","version_requirement":">= 1.0.0 <2.0.0"},
+    {"name":"puppetlabs/apt","version_requirement":">= 1.8.0 <3.0.0"},
     {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 <2.0.0"}
   ],
   "requirements": [

diff --git a/spec/classes/package_spec.rb b/spec/classes/package_spec.rb
@@ -68,7 +68,6 @@
         'location'   => "http://nginx.org/packages/#{operatingsystem.downcase}",
         'repos'      => 'nginx',
         'key'        => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
-        'key_source' => 'http://nginx.org/keys/nginx_signing.key'
       )}
       it { is_expected.to contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::debian]') }
       it { is_expected.to contain_anchor('nginx::package::end').that_requires('Class[nginx::package::debian]') }
@@ -89,7 +88,6 @@
         'location'   => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
         'repos'      => "main",
         'key'        => '16378A33A6EF16762922526E561F9B9CAC40B2F7',
-        'key_source' => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt'
       )}
     end