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

Use hkps.pool.sks-keyservers.net instead of pgp.mit.edu

Browse source 
The MIT server is sometimes unreliable during tests. The pool should
provide a much stabler service.
This commit is contained in:
David Schmitt 2016-05-20 17:54:29 +01:00
parent e0ee0995bb
commit 1e1e4b566e
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/backports.pp
View file

@ -6,6 +6,6 @@ apt::backports { 'qiana':
repos => 'main universe multiverse restricted', repos => 'main universe multiverse restricted',
key => { key => {
id => '630239CC130E1A7FD81A27B140976EAF437D05B5', id => '630239CC130E1A7FD81A27B140976EAF437D05B5',
server => 'pgp.mit.edu', server => 'hkps.pool.sks-keyservers.net',
}, },
} }

2
examples/key.pp
View file

@ -1,6 +1,6 @@
# Declare Apt key for apt.puppetlabs.com source # Declare Apt key for apt.puppetlabs.com source
apt::key { 'puppetlabs': apt::key { 'puppetlabs':
id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
server => 'pgp.mit.edu', server => 'hkps.pool.sks-keyservers.net',
options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"', options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
} }

6
examples/source.pp
View file

@ -8,7 +8,7 @@ apt::source { 'puppetlabs':
repos => 'main', repos => 'main',
key => { key => {
id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
server => 'pgp.mit.edu', server => 'hkps.pool.sks-keyservers.net',
}, },
} }
@ -19,7 +19,7 @@ apt::source { 'debian_testing':
repos => 'main contrib non-free', repos => 'main contrib non-free',
key => { key => {
id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
server => 'subkeys.pgp.net', server => 'hkps.pool.sks-keyservers.net',
}, },
pin => '-10', pin => '-10',
} }
@ -29,7 +29,7 @@ apt::source { 'debian_unstable':
repos => 'main contrib non-free', repos => 'main contrib non-free',
key => { key => {
id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
server => 'subkeys.pgp.net', server => 'hkps.pool.sks-keyservers.net',
}, },
pin => '-10', pin => '-10',
} }

8
spec/acceptance/apt_key_provider_spec.rb
View file

@ -401,13 +401,13 @@ ZTQcCD53HcBLvKX6RJ4ByYawKaQqMa27WK/YWVmFXqVDVk12iKrQW6zktDdGInnD
end end
describe 'server =>' do describe 'server =>' do
context 'pgp.mit.edu' do context 'hkps.pool.sks-keyservers.net' do
it 'works' do it 'works' do
pp = <<-EOS pp = <<-EOS
apt_key { 'puppetlabs': apt_key { 'puppetlabs':
id => '#{PUPPETLABS_GPG_KEY_LONG_ID}', id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
ensure => 'present', ensure => 'present',
server => 'pgp.mit.edu', server => 'hkps.pool.sks-keyservers.net',
} }
EOS EOS
@ -417,13 +417,13 @@ ZTQcCD53HcBLvKX6RJ4ByYawKaQqMa27WK/YWVmFXqVDVk12iKrQW6zktDdGInnD
end end
end end
context 'hkp://pgp.mit.edu:80' do context 'hkp://hkps.pool.sks-keyservers.net:80' do
it 'works' do it 'works' do
pp = <<-EOS pp = <<-EOS
apt_key { 'puppetlabs': apt_key { 'puppetlabs':
id => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}', id => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}',
ensure => 'present', ensure => 'present',
server => 'hkp://pgp.mit.edu:80', server => 'hkp://hkps.pool.sks-keyservers.net:80',
} }
EOS EOS

2
spec/acceptance/apt_spec.rb
View file

@ -21,7 +21,7 @@ describe 'apt class' do
'repos' => 'main', 'repos' => 'main',
'key' => { 'key' => {
'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
'server' => 'pgp.mit.edu', 'server' => 'hkps.pool.sks-keyservers.net',
}, },
}, },
} }