Merge pull request #226 from mark0n/master

Update out of date Debian signing key for backports

diff --git a/README.md b/README.md
index 000d6599aa6dad045449cea5b2c981166262eb34..9c0e45cc36b8af076e3bcee12a151e237abfb0e2 100644 (file)
--- 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/backports.pp b/manifests/backports.pp
index e9180c48c22a80c69ff699e076ca482a46f621dd..9cfa1c01130c55fd4ce25939f7656b2134744795 100644 (file)
--- a/manifests/backports.pp
+++ b/manifests/backports.pp
@@ -29,7 +29,7 @@ class apt::backports(
 
   $release_real = downcase($release)
   $key = $::lsbdistid ? {
-    'debian' => '55BE302B',
+    'debian' => '46925553',
     'ubuntu' => '437D05B5',
   }
   $repos = $::lsbdistid ? {

diff --git a/manifests/debian/testing.pp b/manifests/debian/testing.pp
index 45133470fa4c6c229825079ba38ac9aa1dbbe60b..3a82b4f7fd9266447333ba6f2199e3c93b7bc9f2 100644 (file)
--- 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 401c9c5cda7401afbc5988c58260af62fb277015..77df94b0af572df1fc1aaf23e7b3ae1261917da6 100644 (file)
--- 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 27c6708f259407a5b9d2e550c3f0d8eb37395be7..98ad873af54a3d7b6f29ae17851e9aea9d0152f7 100644 (file)
--- 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 ca55ef687bd100c54cea2af8f2851ad28767471b..20487333f67ae6b3683998dcd5155c484eb606f5 100644 (file)
--- a/spec/classes/debian_testing_spec.rb
+++ b/spec/classes/debian_testing_spec.rb
@@ -7,7 +7,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 f5ed4558a755df22882842a130870d1eccc59466..70724f90bd04d4fefa5441b516b928edfb461629 100644 (file)
--- a/spec/classes/debian_unstable_spec.rb
+++ b/spec/classes/debian_unstable_spec.rb
@@ -7,7 +7,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 d83cb9787ae9a5ee2e107d034b12df37e88b52ea..c20b59662a0e4ac2a8644dd8adb37ca7363cf0b3 100644 (file)
--- 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',
 }