diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2009-11-25 23:29:57 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2009-11-25 23:29:57 +0100 |
| commit | c0d438474bac961897f9e9472356222f79350c39 (patch) | |
| tree | 6e8f83d52d01983d0e43dd8797e71ca13dc6b1d1 /doc | |
| parent | ce857f32cf3c73ee67147ea0eafadb5a1c5da952 (diff) | |
add https options which default to the ones from http for the https
method as this is more sane than using only the http options without
a possibility to override these for https.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt.conf.5.xml | 8 | ||||
| -rw-r--r-- | doc/examples/configure-index | 33 |
2 files changed, 29 insertions, 12 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 726bca2cc..d7ad51cfb 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -284,9 +284,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </varlistentry> <varlistentry><term>https</term> - <listitem><para>HTTPS URIs. Cache-control and proxy options are the same as for - <literal>http</literal> method. - <literal>Pipeline-Depth</literal> option is not supported yet.</para> + <listitem><para>HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and + proxy options are the same as for <literal>http</literal> method and will also + default to the options from the <literal>http</literal> method if they are not + explicitly set for https. <literal>Pipeline-Depth</literal> option is not + supported yet.</para> <para><literal>CaInfo</literal> suboption specifies place of file that holds info about trusted certificates. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 16e864d89..7e86b3d4a 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -194,19 +194,34 @@ Acquire User-Agent "Debian APT-HTTP/1.3"; }; - // HTTPS method configuration: - // - uses the http proxy config - // - uses the http cache-control values - // - uses the http Dl-Limit values - https + + + // HTTPS method configuration: uses the http + // - proxy config + // - cache-control values + // - Dl-Limit, Timout, ... values + // if not set explicit for https + // + // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz + // for more examples + https { Verify-Peer "false"; SslCert "/etc/apt/some.pem"; - CaPath "/etc/ssl/certs"; - Verify-Host" "true"; - AllowRedirect "true"; + CaPath "/etc/ssl/certs"; + Verify-Host" "true"; + AllowRedirect "true"; + + Timeout "120"; + AllowRedirect "true"; + + // Cache Control. Note these do not work with Squid 2.0.2 + No-Cache "false"; + Max-Age "86400"; // 1 Day age on index files + No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "7"; // 7Kb/sec maximum download rate - User-Agent "Debian APT-CURL/1.0"; + User-Agent "Debian APT-CURL/1.0"; }; ftp |