From a11af502cd839efbdab56da95aa1965e75d7ae1c Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Fri, 3 Jun 2011 00:20:00 -0700
Subject: [PATCH] added the ability to specify the content of a key

Allows us to pass key_content when we specify a source.
---
 manifests/source.pp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/manifests/source.pp b/manifests/source.pp
index b6e8476..56a8005 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -9,7 +9,8 @@ define apt::source(
   $required_packages = false,
   $key = false,
   $key_server = 'keyserver.ubuntu.com',
-  $pin = false
+  $pin = false,
+  $key_content = false
 ) {
 
   include apt::params
@@ -42,9 +43,17 @@ define apt::source(
   }
 
   if $key != false {
-    exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}":
-      unless => "/usr/bin/apt-key list | grep ${key}",
-      before => File["${name}.list"],
+    if $key_content {
+      exec { "Add key: ${key} from content":
+        command => "/bin/echo '${key_content}' | /usr/bin/apt-key add -",
+        unless => "/usr/bin/apt-key list | /bin/grep '${key}'",
+        before => File["${name}.list"],
+      } 
+    } else {
+      exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}":
+        unless => "/usr/bin/apt-key list | /bin/grep ${key}",
+        before => File["${name}.list"],
+      }
     }
   }
 }
-- 
2.45.2