production-config-cambridge: Use new squid proxy

Specify both HttpProxy and DebianMirrorProxy.  In my tests this seems
to improve some of the apparently-intercepting-proxy-related failures,
and it will certainly improve logging.

I set DebianMirrorProxy too so that queries to security.d.o go through
the proxy.  Ideally we would have a apt cache that could be used as an
http proxy rather than as an origin server; when that happens we can
set DebianMirrorProxy to point to it and do away with DebianMirrorHost
(as we do in Massachusetts).

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/production-config-cambridge b/production-config-cambridge
index f801303023afc5f6a5c65a53e1d10dbac33b9da0..012a056039e58556bfaa527b97e87774180a3774 100644 (file)
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -82,6 +82,9 @@ XenUseUser osstest
 #DebianMirrorHost debian.uk.xensource.com
 DebianMirrorHost 10.80.16.196
 
+HttpProxy http://osstest.xs.citrite.net:3128/
+DebianMirrorProxy http://osstest.xs.citrite.net:3128/
+
 HostProp_NtpServer ntp.uk.xensource.com
 HostProp_DhcpWatchMethod leases dhcp3 dns1.uk.xensource.com:5556