From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 9 Aug 2020 00:09:14 +0000 (+0100)
Subject: Merge branch 'deploy' into deploy.crybaby
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-chroot/commitdiff_plain/refs/heads/deploy.crybaby?hp=ee2edd7c84587c58c2d7e0cb5d2c97f978f38757

Merge branch 'deploy' into deploy.crybaby

* deploy:
  Makefile: Don't insist on `/usr/lib/.../coreutils/'.
  bin/chroot-maint: Enhance the `CROSS_TOOLS' pattern machinery.
---

diff --git a/etc/apt-conf.d/90local b/etc/apt-conf.d/90local
index d69c64c..d3febb3 100644
--- a/etc/apt-conf.d/90local
+++ b/etc/apt-conf.d/90local
@@ -1,5 +1,5 @@
 ### -*-conf-*-
 
 Acquire {
-	http::Proxy "http://universe.distorted.org.uk:3142/";
+	http::Proxy "http://localhost:3142/";
 }