production-config-cambridge: Use squid cache, not local apt proxy

debian.uk.xensource.com is no more (and the service name seems to have
been discarded).  There is repo.citrite.net instead but it is a
proprietary appliance which - although it claims to be able to handle
apt repositories - is not compatible with debian-installer; at least,
jessie's d-i.

Swap to ftp.uk.debian.org (and rely for caching on the squid cache
which we have for non-apt stuff already).  That works well enough for
stable suites, at least.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/production-config-cambridge b/production-config-cambridge
index 8647feb26f9b8a36481f700c28c78e04c4dcd657..5c9a4a287c1c8e81d5a20d214de1b885c4842d37 100644 (file)
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -91,9 +91,14 @@ MicrocodeUpdateI386 microcode.x86.2015-06-12.cpio
 XenUsePath /usr/groups/xencore/systems/bin/xenuse
 XenUseUser osstest
 
-# We use the IP address because Citrix can't manage reliable nameservice
-#DebianMirrorHost debian.uk.xensource.com
-DebianMirrorHost 10.80.16.196
+# Ideally we would use the IP address because Citrix can't manage
+# reliable nameservice but this new proprietary mirror does not
+# work if it doesn't get a suitable Host header.
+#DebianMirrorHost repo.citrite.net
+#DebianMirrorSubpath ctx-remote-deb-debian
+# Also the proprietary mirror doesn't work because it redirects to http
+# which d-i does not support.  So use our squid.
+DebianMirrorHost ftp.uk.debian.org
 
 HttpProxy http://osstest.xs.citrite.net:3128/
 DebianMirrorProxy http://osstest.xs.citrite.net:3128/