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

Fix gpg key checking warings after f588f26

Browse source 
Use the full fingerprint for all keys to silence the warning.
This commit is contained in:
Patrick Gansterer 2015-03-16 19:34:24 +01:00
parent be54e18899
commit 61a4fb6979
8 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -200,7 +200,7 @@ class { 'apt':
release => 'unstable', release => 'unstable',
repos => 'main contrib non-free', repos => 'main contrib non-free',
required_packages => 'debian-keyring debian-archive-keyring', required_packages => 'debian-keyring debian-archive-keyring',
key => '8B48AD6246925553', key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
key_server => 'subkeys.pgp.net', key_server => 'subkeys.pgp.net',
pin => '-10', pin => '-10',
include_src => true, include_src => true,

4
manifests/backports.pp
View file

@ -58,8 +58,8 @@ class apt::backports(
} }
$key = $distid ? { $key = $distid ? {
'debian' => '46925553', 'debian' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
'ubuntu' => '437D05B5', 'ubuntu' => '630239CC130E1A7FD81A27B140976EAF437D05B5',
} }
$repos = $distid ? { $repos = $distid ? {
'debian' => 'main contrib non-free', 'debian' => 'main contrib non-free',

2
manifests/debian/testing.pp
View file

@ -14,7 +14,7 @@ class apt::debian::testing {
release => 'testing', release => 'testing',
repos => 'main contrib non-free', repos => 'main contrib non-free',
required_packages => 'debian-keyring debian-archive-keyring', required_packages => 'debian-keyring debian-archive-keyring',
key => '46925553', key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
key_server => 'subkeys.pgp.net', key_server => 'subkeys.pgp.net',
pin => '-10', pin => '-10',
} }

2
manifests/debian/unstable.pp
View file

@ -14,7 +14,7 @@ class apt::debian::unstable {
release => 'unstable', release => 'unstable',
repos => 'main contrib non-free', repos => 'main contrib non-free',
required_packages => 'debian-keyring debian-archive-keyring', required_packages => 'debian-keyring debian-archive-keyring',
key => '46925553', key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
key_server => 'subkeys.pgp.net', key_server => 'subkeys.pgp.net',
pin => '-10', pin => '-10',
} }

2
spec/acceptance/apt_spec.rb
View file

@ -25,7 +25,7 @@ describe 'apt class' do
'ensure' => present, 'ensure' => present,
'location' => 'http://apt.puppetlabs.com', 'location' => 'http://apt.puppetlabs.com',
'repos' => 'main', 'repos' => 'main',
'key' => '4BD6EC30', 'key' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
'key_server' => 'pgp.mit.edu', 'key_server' => 'pgp.mit.edu',
} }
}, },

4
spec/classes/apt_spec.rb
View file

@ -155,7 +155,7 @@ describe 'apt', :type => :class do
'release' => 'unstable', 'release' => 'unstable',
'repos' => 'main contrib non-free', 'repos' => 'main contrib non-free',
'required_packages' => 'debian-keyring debian-archive-keyring', 'required_packages' => 'debian-keyring debian-archive-keyring',
'key' => '55BE302B', 'key' => '150C8614919D8446E01E83AF9AA38DCD55BE302B',
'key_server' => 'subkeys.pgp.net', 'key_server' => 'subkeys.pgp.net',
'pin' => '-10', 'pin' => '-10',
'include_src' => true 'include_src' => true
@ -163,7 +163,7 @@ describe 'apt', :type => :class do
'puppetlabs' => { 'puppetlabs' => {
'location' => 'http://apt.puppetlabs.com', 'location' => 'http://apt.puppetlabs.com',
'repos' => 'main', 'repos' => 'main',
'key' => '4BD6EC30', 'key' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
'key_server' => 'pgp.mit.edu', 'key_server' => 'pgp.mit.edu',
} }
} } } } } }

12
spec/classes/backports_spec.rb
View file

@ -17,7 +17,7 @@ describe 'apt::backports', :type => :class do
'location' => 'http://old-releases.ubuntu.com/ubuntu', 'location' => 'http://old-releases.ubuntu.com/ubuntu',
'release' => 'karmic-backports', 'release' => 'karmic-backports',
'repos' => 'main universe multiverse restricted', 'repos' => 'main universe multiverse restricted',
'key' => '437D05B5', 'key' => '630239CC130E1A7FD81A27B140976EAF437D05B5',
'key_server' => 'pgp.mit.edu', 'key_server' => 'pgp.mit.edu',
}) })
} }
@ -51,7 +51,7 @@ describe 'apt::backports', :type => :class do
'location' => 'http://old-releases.ubuntu.com/ubuntu', 'location' => 'http://old-releases.ubuntu.com/ubuntu',
'release' => 'karmic-backports', 'release' => 'karmic-backports',
'repos' => 'main universe multiverse restricted', 'repos' => 'main universe multiverse restricted',
'key' => '437D05B5', 'key' => '630239CC130E1A7FD81A27B140976EAF437D05B5',
'key_server' => 'pgp.mit.edu', 'key_server' => 'pgp.mit.edu',
}) })
} }
@ -77,7 +77,7 @@ describe 'apt::backports', :type => :class do
'location' => 'http://backports.debian.org/debian-backports', 'location' => 'http://backports.debian.org/debian-backports',
'release' => 'squeeze-backports', 'release' => 'squeeze-backports',
'repos' => 'main contrib non-free', 'repos' => 'main contrib non-free',
'key' => '46925553', 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
'key_server' => 'pgp.mit.edu', 'key_server' => 'pgp.mit.edu',
}) })
} }
@ -103,7 +103,7 @@ describe 'apt::backports', :type => :class do
'location' => 'http://ftp.debian.org/debian/', 'location' => 'http://ftp.debian.org/debian/',
'release' => 'wheezy-backports', 'release' => 'wheezy-backports',
'repos' => 'main contrib non-free', 'repos' => 'main contrib non-free',
'key' => '46925553', 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
'key_server' => 'pgp.mit.edu', 'key_server' => 'pgp.mit.edu',
}) })
} }
@ -129,7 +129,7 @@ describe 'apt::backports', :type => :class do
'location' => 'http://us.archive.ubuntu.com/ubuntu', 'location' => 'http://us.archive.ubuntu.com/ubuntu',
'release' => 'trusty-backports', 'release' => 'trusty-backports',
'repos' => 'main universe multiverse restricted', 'repos' => 'main universe multiverse restricted',
'key' => '437D05B5', 'key' => '630239CC130E1A7FD81A27B140976EAF437D05B5',
'key_server' => 'pgp.mit.edu', 'key_server' => 'pgp.mit.edu',
}) })
} }
@ -163,7 +163,7 @@ describe 'apt::backports', :type => :class do
'location' => location, 'location' => location,
'release' => 'squeeze-backports', 'release' => 'squeeze-backports',
'repos' => 'main contrib non-free', 'repos' => 'main contrib non-free',
'key' => '46925553', 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
'key_server' => 'pgp.mit.edu', 'key_server' => 'pgp.mit.edu',
}) })
} }

4
tests/source.pp
View file

@ -15,7 +15,7 @@ apt::source { 'debian_testing':
location => 'http://debian.mirror.iweb.ca/debian/', location => 'http://debian.mirror.iweb.ca/debian/',
release => 'testing', release => 'testing',
repos => 'main contrib non-free', repos => 'main contrib non-free',
key => '46925553', key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
key_server => 'subkeys.pgp.net', key_server => 'subkeys.pgp.net',
pin => '-10', pin => '-10',
} }
@ -23,7 +23,7 @@ apt::source { 'debian_unstable':
location => 'http://debian.mirror.iweb.ca/debian/', location => 'http://debian.mirror.iweb.ca/debian/',
release => 'unstable', release => 'unstable',
repos => 'main contrib non-free', repos => 'main contrib non-free',
key => '46925553', key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
key_server => 'subkeys.pgp.net', key_server => 'subkeys.pgp.net',
pin => '-10', pin => '-10',
} }