From ad418950788a819b96b16ef640111755fb2ae5a7 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Thu, 2 Dec 2010 09:48:36 +0200
Subject: [PATCH] Added support for APT proxy

---
 apt/manifests/init.pp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/apt/manifests/init.pp b/apt/manifests/init.pp
index 40b0164..f43f494 100644
--- a/apt/manifests/init.pp
+++ b/apt/manifests/init.pp
@@ -134,6 +134,11 @@ define apt::package($ensure, $source) {
 
 # Add apt repository.
 #
+# === Global variables
+#
+#   $apt_proxy:
+#       APT proxy host.
+#
 # === Parameters
 #
 #   $name:
@@ -159,20 +164,26 @@ define apt::package($ensure, $source) {
 #
 define apt::repo($source, $dist="", $components="main", $key="", $keyserver="") {
 
+    include apt
+
     if $dist {
         $dist_real = $dist
     } else {
         $dist_real = $lsbdistcodename
     }
 
-    include apt
+    if $apt_proxy {
+        $source_real = regsubst($source, "^([^:]+://)(.+)$", "\1$apt_proxy/\2")
+    } else {
+        $source_real = $source
+    }
 
     file { "/etc/apt/sources.list.d/${name}.list":
         ensure  => present,
         mode    => 0644,
         owner   => root,
         group   => root,
-        content => "deb ${source} ${dist_real} ${components}\ndeb-src ${source} ${dist_real} ${components}\n",
+        content => "deb ${source_real} ${dist_real} ${components}\ndeb-src ${source_real} ${dist_real} ${components}\n",
         notify  => Exec["apt-get-update"],
     }
 
@@ -186,7 +197,7 @@ define apt::repo($source, $dist="", $components="main", $key="", $keyserver="")
             }
         }
 
-        exec { "apt-key-add":
+        exec { "apt-key-add-${key}":
             environment => $http_proxy ? {
                 ""      => undef,
                 default => "http_proxy=${http_proxy}",