diff --git a/README.md b/README.md index fc7f006c3..eb9001a4a 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ This module manages NGINX configuration. * Puppet 4.6.1 or later. Puppet 3 was supported up until release 0.6.0. * apt is now a soft dependency. If your system uses apt, you'll need to - configure an appropriate version of the apt module. Version 4.4.0 or higher is - recommended because of the proper handling of `apt-transport-https`. + configure an appropriate version of the apt module. Version 9.2.0 or higher is + recommended because of supporting "modern keyrings". ### Additional Documentation diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp index 8a8022669..2fee884dc 100644 --- a/manifests/package/debian.pp +++ b/manifests/package/debian.pp @@ -31,7 +31,10 @@ apt::source { 'nginx': location => $stable_repo_source, repos => 'nginx', - key => { 'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62' }, + key => { + 'name' => 'nginx', + 'source' => 'https://nginx.org/keys/nginx_signing.key', + }, release => $release, architecture => $facts['os']['architecture'], } @@ -44,7 +47,10 @@ apt::source { 'nginx': location => $mainline_repo_source, repos => 'nginx', - key => { 'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62' }, + key => { + 'name' => 'nginx', + 'source' => 'https://nginx.org/keys/nginx_signing.key', + }, release => $release, architecture => $facts['os']['architecture'], } @@ -57,10 +63,12 @@ apt::source { 'nginx': location => $passenger_repo_source, repos => 'main', - key => { 'id' => '16378A33A6EF16762922526E561F9B9CAC40B2F7' }, + key => { + 'name' => 'phusionpassenger', + 'source' => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt', + }, architecture => $facts['os']['architecture'], } - package { $passenger_package_name: ensure => $passenger_package_ensure, require => Exec['apt_update'], diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb index 016dbdf45..5089412d2 100644 --- a/spec/classes/nginx_spec.rb +++ b/spec/classes/nginx_spec.rb @@ -160,7 +160,10 @@ is_expected.to contain_apt__source('nginx').with( 'location' => "https://nginx.org/packages/#{facts[:os]['name'].downcase}", 'repos' => 'nginx', - 'key' => { 'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62' } + 'key' => { + 'source' => 'https://nginx.org/keys/nginx_signing.key', + 'name' => 'nginx' + } ) end end @@ -195,7 +198,10 @@ is_expected.to contain_apt__source('nginx').with( 'location' => 'https://oss-binaries.phusionpassenger.com/apt/passenger', 'repos' => 'main', - 'key' => { 'id' => '16378A33A6EF16762922526E561F9B9CAC40B2F7' } + 'key' => { + 'source' => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt', + 'name' => 'phusionpassenger' + } ) end end