Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 11b0886

Browse files
committedAug 26, 2024·
Fix apt-key deprecated message
1 parent 12d6b62 commit 11b0886

File tree

2 files changed

+23
-10
lines changed

2 files changed

+23
-10
lines changed
 

‎manifests/package/debian.pp

+15-8
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
apt::source { 'nginx':
3232
location => $stable_repo_source,
3333
repos => 'nginx',
34-
key => { 'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62' },
34+
key => {
35+
'name' => 'nginx',
36+
'source' => 'https://nginx.org/keys/nginx_signing.key',
37+
},
3538
release => $release,
3639
architecture => $facts['os']['architecture'],
3740
}
@@ -42,11 +45,13 @@
4245
default => $repo_source,
4346
}
4447
apt::source { 'nginx':
45-
location => $mainline_repo_source,
46-
repos => 'nginx',
47-
key => { 'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62' },
48-
release => $release,
49-
architecture => $facts['os']['architecture'],
48+
location => $mainline_repo_source,
49+
repos => 'nginx',
50+
key => {
51+
'name' => 'nginx',
52+
'source' => 'https://nginx.org/keys/nginx_signing.key',
53+
}, release => $release,
54+
architecture => $facts['os']['architecture'],
5055
}
5156
}
5257
'passenger': {
@@ -57,10 +62,12 @@
5762
apt::source { 'nginx':
5863
location => $passenger_repo_source,
5964
repos => 'main',
60-
key => { 'id' => '16378A33A6EF16762922526E561F9B9CAC40B2F7' },
65+
key => {
66+
'name' => 'phusionpassenger',
67+
'source' => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt',
68+
},
6169
architecture => $facts['os']['architecture'],
6270
}
63-
6471
package { $passenger_package_name:
6572
ensure => $passenger_package_ensure,
6673
require => Exec['apt_update'],

‎spec/classes/nginx_spec.rb

+8-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,10 @@
160160
is_expected.to contain_apt__source('nginx').with(
161161
'location' => "https://nginx.org/packages/#{facts[:os]['name'].downcase}",
162162
'repos' => 'nginx',
163-
'key' => { 'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62' }
163+
'key' => {
164+
'source' => 'https://nginx.org/keys/nginx_signing.key',
165+
'name' => 'nginx'
166+
}
164167
)
165168
end
166169
end
@@ -195,7 +198,10 @@
195198
is_expected.to contain_apt__source('nginx').with(
196199
'location' => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
197200
'repos' => 'main',
198-
'key' => { 'id' => '16378A33A6EF16762922526E561F9B9CAC40B2F7' }
201+
'key' => {
202+
'source' => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt',
203+
'name' => 'phusionpassenger'
204+
}
199205
)
200206
end
201207
end

0 commit comments

Comments
 (0)
Please sign in to comment.