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

Merge pull request #226 from mark0n/master

Browse source 
Update out of date Debian signing key for backports
This commit is contained in:
Hunter Haugen 2014-02-25 09:34:00 -08:00
commit 1853951c0f
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -142,7 +142,7 @@ Adds an apt source to `/etc/apt/sources.list.d/`.
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 => '46925553',
key_server => 'subkeys.pgp.net', key_server => 'subkeys.pgp.net',
pin => '-10', pin => '-10',
include_src => true include_src => true

2
manifests/backports.pp
View file

@ -29,7 +29,7 @@ class apt::backports(
$release_real = downcase($release) $release_real = downcase($release)
$key = $::lsbdistid ? { $key = $::lsbdistid ? {
'debian' => '55BE302B', 'debian' => '46925553',
'ubuntu' => '437D05B5', 'ubuntu' => '437D05B5',
} }
$repos = $::lsbdistid ? { $repos = $::lsbdistid ? {

4
manifests/debian/testing.pp
View file

@ -5,7 +5,7 @@ class apt::debian::testing {
# deb http://debian.mirror.iweb.ca/debian/ testing main contrib non-free # deb http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
# deb-src http://debian.mirror.iweb.ca/debian/ testing main contrib non-free # deb-src http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
# Key: 55BE302B Server: subkeys.pgp.net # Key: 46925553 Server: subkeys.pgp.net
# debian-keyring # debian-keyring
# debian-archive-keyring # debian-archive-keyring
@ -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 => '55BE302B', key => '46925553',
key_server => 'subkeys.pgp.net', key_server => 'subkeys.pgp.net',
pin => '-10', pin => '-10',
} }

4
manifests/debian/unstable.pp
View file

@ -5,7 +5,7 @@ class apt::debian::unstable {
# deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free # deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
# deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free # deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
# Key: 55BE302B Server: subkeys.pgp.net # Key: 46925553 Server: subkeys.pgp.net
# debian-keyring # debian-keyring
# debian-archive-keyring # debian-archive-keyring
@ -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 => '55BE302B', key => '46925553',
key_server => 'subkeys.pgp.net', key_server => 'subkeys.pgp.net',
pin => '-10', pin => '-10',
} }

4
spec/classes/backports_spec.rb
View file

@ -34,7 +34,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' => '55BE302B', 'key' => '46925553',
'key_server' => 'pgp.mit.edu', 'key_server' => 'pgp.mit.edu',
'pin' => '200', 'pin' => '200',
}) })
@ -62,7 +62,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' => '55BE302B', 'key' => '46925553',
'key_server' => 'pgp.mit.edu', 'key_server' => 'pgp.mit.edu',
'pin' => '200', 'pin' => '200',
}) })

2
spec/classes/debian_testing_spec.rb
View file

@ -7,7 +7,7 @@ describe 'apt::debian::testing', :type => :class do
"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" => "55BE302B", "key" => "46925553",
"key_server" => "subkeys.pgp.net", "key_server" => "subkeys.pgp.net",
"pin" => "-10" "pin" => "-10"
}) })

2
spec/classes/debian_unstable_spec.rb
View file

@ -7,7 +7,7 @@ describe 'apt::debian::unstable', :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" => "46925553",
"key_server" => "subkeys.pgp.net", "key_server" => "subkeys.pgp.net",
"pin" => "-10" "pin" => "-10"
}) })

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 => '55BE302B', key => '46925553',
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 => '55BE302B', key => '46925553',
key_server => 'subkeys.pgp.net', key_server => 'subkeys.pgp.net',
pin => '-10', pin => '-10',
} }