Merge pull request #579 from sbadia/use-long-gpg-id

apt::key: puppetlabs-apt check now the full GPG fingerprints.
voxpupuli · Mar 20, 2015 · 13b2e44 · 13b2e44
2 parents 82bda98 + 5f1da4f
commit 13b2e44
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp
@@ -36,15 +36,15 @@
         apt::source { 'nginx':
           location   => "http://nginx.org/packages/${distro}",
           repos      => 'nginx',
-          key        => '7BD9BF62',
+          key        => 'ABF5BD827BD9BF62',
           key_source => 'http://nginx.org/keys/nginx_signing.key',
         }
       }
       'nginx-mainline': {
         apt::source { 'nginx':
           location   => "http://nginx.org/packages/mainline/${distro}",
           repos      => 'nginx',
-          key        => '7BD9BF62',
+          key        => 'ABF5BD827BD9BF62',
           key_source => 'http://nginx.org/keys/nginx_signing.key',
         }
       }
@@ -61,7 +61,7 @@
           ensure  => 'present',
           require => Exec['apt_update'],
         }
-        
+
         if $package_name != 'nginx-extras' {
           warning('You must set $package_name to "nginx-extras" to enable Passenger')
         }

diff --git a/spec/classes/package_spec.rb b/spec/classes/package_spec.rb
@@ -67,7 +67,7 @@
       it { is_expected.to contain_apt__source('nginx').with(
         'location'   => "http://nginx.org/packages/#{operatingsystem.downcase}",
         'repos'      => 'nginx',
-        'key'        => '7BD9BF62',
+        'key'        => 'ABF5BD827BD9BF62',
         '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]') }