From 3aa293a53fb7a2bd789ce3db35950778968079fd Mon Sep 17 00:00:00 2001 From: Martin Konrad Date: Tue, 18 Feb 2014 16:57:01 -0500 Subject: [PATCH] Update out-of-date Debian signing key in remaining files. --- README.md | 2 +- manifests/debian/testing.pp | 4 ++-- manifests/debian/unstable.pp | 4 ++-- spec/classes/backports_spec.rb | 4 ++-- spec/classes/debian_testing_spec.rb | 2 +- spec/classes/debian_unstable_spec.rb | 2 +- tests/source.pp | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 3a7bc8c..1e4c3bb 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ Adds an apt source to `/etc/apt/sources.list.d/`. release => 'unstable', repos => 'main contrib non-free', required_packages => 'debian-keyring debian-archive-keyring', - key => '55BE302B', + key => '46925553', key_server => 'subkeys.pgp.net', pin => '-10', include_src => true diff --git a/manifests/debian/testing.pp b/manifests/debian/testing.pp index 4513347..3a82b4f 100644 --- a/manifests/debian/testing.pp +++ b/manifests/debian/testing.pp @@ -5,7 +5,7 @@ class apt::debian::testing { # 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 - # Key: 55BE302B Server: subkeys.pgp.net + # Key: 46925553 Server: subkeys.pgp.net # debian-keyring # debian-archive-keyring @@ -14,7 +14,7 @@ class apt::debian::testing { release => 'testing', repos => 'main contrib non-free', required_packages => 'debian-keyring debian-archive-keyring', - key => '55BE302B', + key => '46925553', key_server => 'subkeys.pgp.net', pin => '-10', } diff --git a/manifests/debian/unstable.pp b/manifests/debian/unstable.pp index 401c9c5..77df94b 100644 --- a/manifests/debian/unstable.pp +++ b/manifests/debian/unstable.pp @@ -5,7 +5,7 @@ class apt::debian::unstable { # 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 - # Key: 55BE302B Server: subkeys.pgp.net + # Key: 46925553 Server: subkeys.pgp.net # debian-keyring # debian-archive-keyring @@ -14,7 +14,7 @@ class apt::debian::unstable { release => 'unstable', repos => 'main contrib non-free', required_packages => 'debian-keyring debian-archive-keyring', - key => '55BE302B', + key => '46925553', key_server => 'subkeys.pgp.net', pin => '-10', } diff --git a/spec/classes/backports_spec.rb b/spec/classes/backports_spec.rb index 27c6708..98ad873 100644 --- a/spec/classes/backports_spec.rb +++ b/spec/classes/backports_spec.rb @@ -34,7 +34,7 @@ describe 'apt::backports', :type => :class do 'location' => 'http://backports.debian.org/debian-backports', 'release' => 'squeeze-backports', 'repos' => 'main contrib non-free', - 'key' => '55BE302B', + 'key' => '46925553', 'key_server' => 'pgp.mit.edu', 'pin' => '200', }) @@ -62,7 +62,7 @@ describe 'apt::backports', :type => :class do 'location' => location, 'release' => 'squeeze-backports', 'repos' => 'main contrib non-free', - 'key' => '55BE302B', + 'key' => '46925553', 'key_server' => 'pgp.mit.edu', 'pin' => '200', }) diff --git a/spec/classes/debian_testing_spec.rb b/spec/classes/debian_testing_spec.rb index 6006afb..d5aa896 100644 --- a/spec/classes/debian_testing_spec.rb +++ b/spec/classes/debian_testing_spec.rb @@ -6,7 +6,7 @@ describe 'apt::debian::testing', :type => :class do "release" => "testing", "repos" => "main contrib non-free", "required_packages" => "debian-keyring debian-archive-keyring", - "key" => "55BE302B", + "key" => "46925553", "key_server" => "subkeys.pgp.net", "pin" => "-10" }) diff --git a/spec/classes/debian_unstable_spec.rb b/spec/classes/debian_unstable_spec.rb index 411182d..31f5112 100644 --- a/spec/classes/debian_unstable_spec.rb +++ b/spec/classes/debian_unstable_spec.rb @@ -6,7 +6,7 @@ describe 'apt::debian::unstable', :type => :class do "release" => "unstable", "repos" => "main contrib non-free", "required_packages" => "debian-keyring debian-archive-keyring", - "key" => "55BE302B", + "key" => "46925553", "key_server" => "subkeys.pgp.net", "pin" => "-10" }) diff --git a/tests/source.pp b/tests/source.pp index d83cb97..c20b596 100644 --- a/tests/source.pp +++ b/tests/source.pp @@ -15,7 +15,7 @@ apt::source { 'debian_testing': location => 'http://debian.mirror.iweb.ca/debian/', release => 'testing', repos => 'main contrib non-free', - key => '55BE302B', + key => '46925553', key_server => 'subkeys.pgp.net', pin => '-10', } @@ -23,7 +23,7 @@ apt::source { 'debian_unstable': location => 'http://debian.mirror.iweb.ca/debian/', release => 'unstable', repos => 'main contrib non-free', - key => '55BE302B', + key => '46925553', key_server => 'subkeys.pgp.net', pin => '-10', } -- 2.32.3