Fix gpg key checking warings after f588f26

[puppet-modules/puppetlabs-apt.git] / tests / source.pp

diff --git a/tests/source.pp b/tests/source.pp
index 4db740d4175e903f43b3b8a4de59bd4b4c969018..823b37b73632667f88d165e9559890cdb5decfcd 100644 (file)
--- a/tests/source.pp
+++ b/tests/source.pp
@@ -1,29 +1,29 @@
+# Declare the apt class to manage /etc/apt/sources.list and /etc/sources.list.d
 class { 'apt': }
-apt::source { 'foo':
-  location => '',
-  release => 'karmic',
-  repos => 'main',
-  include_src => true,
-  required_packages => false,
-  key => false,
-  key_server => 'keyserver.ubuntu.com',
-  pin => '600'
+
+# Install the puppetlabs apt source
+# Release is automatically obtained from lsbdistcodename fact if available.
+apt::source { 'puppetlabs':
+  location   => 'http://apt.puppetlabs.com',
+  repos      => 'main',
+  key        => '4BD6EC30',
+  key_server => 'pgp.mit.edu',
 }
 
 # test two sources with the same key
-apt::source { "debian_testing":
-  location => "http://debian.mirror.iweb.ca/debian/",
-  release => "testing",
-  repos => "main contrib non-free",
-  key => "55BE302B",
-  key_server => "subkeys.pgp.net",
-  pin => "-10"
+apt::source { 'debian_testing':
+  location   => 'http://debian.mirror.iweb.ca/debian/',
+  release    => 'testing',
+  repos      => 'main contrib non-free',
+  key        => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+  key_server => 'subkeys.pgp.net',
+  pin        => '-10',
 }
-apt::source { "debian_unstable":
-  location => "http://debian.mirror.iweb.ca/debian/",
-  release => "unstable",
-  repos => "main contrib non-free",
-  key => "55BE302B",
-  key_server => "subkeys.pgp.net",
-  pin => "-10"
+apt::source { 'debian_unstable':
+  location   => 'http://debian.mirror.iweb.ca/debian/',
+  release    => 'unstable',
+  repos      => 'main contrib non-free',
+  key        => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+  key_server => 'subkeys.pgp.net',
+  pin        => '-10',
 }