diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp index 5f06921..9e7e316 100644 --- a/manifests/package/debian.pp +++ b/manifests/package/debian.pp @@ -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') } diff --git a/spec/classes/package_spec.rb b/spec/classes/package_spec.rb index 77c8344..6b6ef6f 100644 --- a/spec/classes/package_spec.rb +++ b/spec/classes/package_spec.rb @@ -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]') }