From 9515ed7bcdb32c7985ca83d309beda7155d02136 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 20 Jun 2016 13:49:31 +0200 Subject: implement and document DIRECT for auto-detect-proxy There is a subtile difference between an empty setting and "DIRECT" in the configuration as the later overrides the generic settings while the earlier does not. Also, non-zero exitcodes should really be reported as an error rather than silently discarded. --- doc/apt.conf.5.xml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 6aa0c9629..d71f99c0a 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -444,15 +444,20 @@ APT::Compressor::rev { only if the client uses a known identifier. Acquire::http::Proxy-Auto-Detect can be used to - specify an external command to discover the http proxy to use. Apt expects - the command to output the proxy on stdout in the style - http://proxy:port/. This will override the - generic Acquire::http::Proxy but not any specific - host proxy configuration set via - Acquire::http::Proxy::$HOST. + specify an external command to discover the http proxy to use. The first + and only parameter is an URI denoting the host to be contacted to allow + for host-specific configuration. APT expects the command to output the + proxy on stdout as a single line in the style http://proxy:port/ + or the word DIRECT if no proxy should be used. No output + indicates that the generic proxy settings should be used. + + Note that auto-detection will not be used for a host if a host-specific proxy + configuration is already set via Acquire::http::Proxy::HOST. See the &squid-deb-proxy-client; package for an example implementation that - uses avahi. This option takes precedence over the legacy option name + uses avahi. + + This option takes precedence over the legacy option name ProxyAutoDetect. -- cgit v1.2.3