diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:50:43 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:50:43 +0100 |
| commit | 3de76e7b05224b9696a75908b0a4259349e20823 (patch) | |
| tree | 428799424b34d7911e6dd39a0ab2ef94c7900525 /manifests/proxy_client.pp | |
| parent | f25a8a91099d6c1ef512a5fb21581abc62e1519a (diff) | |
| parent | 92aa5a51e95d74604a40318558aa98f70fcf7720 (diff) | |
Merge commit '92aa5a51e95d74604a40318558aa98f70fcf7720'.
A bunch of painlessly merged commits.
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/proxy_client.pp')
| -rw-r--r-- | manifests/proxy_client.pp | 2 |
1 files changed, 1 insertions, 1 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 } |