Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix apt-key deprecated message #1610

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix apt-key deprecated message #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 12 additions & 4 deletions manifests/package/debian.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@
apt::source { 'nginx':
location => $stable_repo_source,
repos => 'nginx',
key => { 'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62' },
key => {
'name' => 'nginx.asc',
'source' => 'https://nginx.org/keys/nginx_signing.key',
},
release => $release,
architecture => $facts['os']['architecture'],
}
Expand All @@ -44,7 +47,10 @@
apt::source { 'nginx':
location => $mainline_repo_source,
repos => 'nginx',
key => { 'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62' },
key => {
'name' => 'nginx.asc',
'source' => 'https://nginx.org/keys/nginx_signing.key',
},
release => $release,
architecture => $facts['os']['architecture'],
}
Expand All @@ -57,10 +63,12 @@
apt::source { 'nginx':
location => $passenger_repo_source,
repos => 'main',
key => { 'id' => '16378A33A6EF16762922526E561F9B9CAC40B2F7' },
key => {
'name' => 'phusionpassenger.asc',
'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'],
Expand Down
10 changes: 8 additions & 2 deletions spec/classes/nginx_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.asc'
}
)
end
end
Expand Down Expand Up @@ -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.asc'
}
)
end
end
Expand Down
Loading