opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #583 from errygg/errygg-patch-1

Browse source 
Changing apt key to 40 characters to support new apt module
This commit is contained in:
James Fryman 2015-03-24 13:45:12 -05:00
commit 124b1c07b8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
manifests/package/debian.pp
View file

@ -36,7 +36,7 @@ class nginx::package::debian(
apt::source { 'nginx':
location => "http://nginx.org/packages/${distro}",
repos => 'nginx',
key => 'ABF5BD827BD9BF62',
key => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
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 => 'ABF5BD827BD9BF62',
key => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
key_source => 'http://nginx.org/keys/nginx_signing.key',
}
}
@ -52,7 +52,7 @@ class nginx::package::debian(
apt::source { 'nginx':
location => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
repos => 'main',
key => '561F9B9CAC40B2F7',
key => '16378A33A6EF16762922526E561F9B9CAC40B2F7',
key_source => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt',
required_packages => 'apt-transport-https ca-certificates',
}

4
spec/classes/package_spec.rb
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' => 'ABF5BD827BD9BF62',
'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]') }
@ -88,7 +88,7 @@ describe 'nginx::package' do
it { is_expected.to contain_apt__source('nginx').with(
'location' => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
'repos' => "main",
'key' => '561F9B9CAC40B2F7',
'key' => '16378A33A6EF16762922526E561F9B9CAC40B2F7',
'key_source' => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt'
)}
end