From 26714ae4d2992c85082ec37e6c40d725d097f79a Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Mon, 25 Oct 2010 11:58:27 -0400 Subject: 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 --- manifests/proxy_client.pp | 2 +- templates/20proxy.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/proxy_client.pp b/manifests/proxy_client.pp index 9883933..23e9bd1 100644 --- 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 36b26a0..8f57e73 100644 --- 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 %>"; }; -- cgit v1.2.3