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

apt:🔑 puppetlabs-apt check now the full GPG fingerprints.
This commit is contained in:
James Fryman 2015-03-20 16:13:30 -05:00
commit 13b2e4493d
2 changed files with 4 additions and 4 deletions

View file

@ -36,7 +36,7 @@ class nginx::package::debian(
apt::source { 'nginx':
location => "http://nginx.org/packages/${distro}",
repos => 'nginx',
key => '7BD9BF62',
key => 'ABF5BD827BD9BF62',
key_source => 'http://nginx.org/keys/nginx_signing.key',
}
}
@ -44,7 +44,7 @@ class nginx::package::debian(
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 @@ class nginx::package::debian(
ensure => 'present',
require => Exec['apt_update'],
}
if $package_name != 'nginx-extras' {
warning('You must set $package_name to "nginx-extras" to enable Passenger')
}

View file

@ -67,7 +67,7 @@ describe 'nginx::package' do
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]') }