From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 18 Jun 2024 22:46:19 +0000 (+0100)
Subject: Merge branch 'deploy' into deploy.spirit
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-chroot/commitdiff_plain/refs/heads/deploy.spirit?hp=cc8e923f9686cc1fdbbb20f51e9ad1ec290f30a6

Merge branch 'deploy' into deploy.spirit

* deploy:
  Makefile: Add `help' summary.
  Makefile: Float `V' along with the other configuration variables
  bin/chroot-maint: Set HTTPS proxy along with the HTTP proxy.
  Makefile, etc/aptsrc.conf: Update for new Debian releases.
  Makefile: Force creation of directories using an order-only pattern rule.
  Makefile: Introduce and use some improved pathname manipulation functions.
  Makefile: Don't create random directories in the working tree.
  Makefile: Make `all' and `schroot-config' be single-colon rules.
---

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/";
 }