Include the protocol in the proxy URL

The current proxy_client template makes it possible to communicate with
the proxy only via HTTP. Add the protocol to the variable so that it's
possible to change the protocol.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>

diff --git a/manifests/proxy_client.pp b/manifests/proxy_client.pp
index 988393300eed83536f350d8a3e729cd837722da4..23e9bd1108b46131a238b45207972458ce68abef 100644 (file)
--- a/manifests/proxy_client.pp
+++ b/manifests/proxy_client.pp
@@ -1,7 +1,7 @@
 class apt::proxy_client {
 
   $real_apt_proxy = $apt_proxy ? {
-    "" => "localhost",
+    "" => "http://localhost",
     default => $apt_proxy
   }
 

diff --git a/templates/20proxy.erb b/templates/20proxy.erb
index 36b26a0c802f4f764c2ebe8d6ee53b69374a883f..8f57e730aeaf5aacee6b892fb4107a84026c0c2f 100644 (file)
--- a/templates/20proxy.erb
+++ b/templates/20proxy.erb
@@ -1,4 +1,4 @@
 # This file is brought to you by Puppet
 # all local modifications will be overwritten
 
-Acquire::http { Proxy "http://<%= real_apt_proxy %>:<%= real_apt_proxy_port %>"; };
+Acquire::http { Proxy "<%= real_apt_proxy %>:<%= real_apt_proxy_port %>"; };