summaryrefslogtreecommitdiff
path: root/doc/apt_auth.conf.5.xml
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2018-12-03 17:39:03 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-01-14 14:35:10 +0100
commitfeed3ec105cd6be7b5d23da14c6cfca8572ee725 (patch)
tree225d5105a0a37db4940b6fa9f23384d97571af77 /doc/apt_auth.conf.5.xml
parent67fdc0cf55f4e91905b16e0f582ce70999997c8d (diff)
Add support for /etc/apt/auth.conf.d/*.conf (netrcparts)
This allows us to install matching auth files for sources.list.d files, for example; very useful. This converts aptmethod's authfd from one FileFd to a vector of pointers to FileFd, as FileFd cannot be copied, and move operators are hard. (cherry picked from commit bbfcc05c1978decd28df9681fd73e2a7d9a8c2a5) LP: #1811120 (cherry picked from commit 5629f35ecb7956b180364ebaf57e79f35885344e)
Diffstat (limited to 'doc/apt_auth.conf.5.xml')
-rw-r--r--doc/apt_auth.conf.5.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/apt_auth.conf.5.xml b/doc/apt_auth.conf.5.xml
index 8621cdee2..fc5d9d1be 100644
--- a/doc/apt_auth.conf.5.xml
+++ b/doc/apt_auth.conf.5.xml
@@ -36,7 +36,8 @@ needed to connect to a proxy or to download data from a repository on the other
hand shouldn't always be accessible by everyone and can hence not be placed in a
file with world-readable file permissions.</para>
-<para>The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used to store
+<para>The APT auth.conf file <filename>/etc/apt/auth.conf</filename>, and .conf files inside
+<filename>/etc/apt/auth.conf.d</filename> can be used to store
login information in a netrc-like format with restrictive file permissions.</para>
</refsect1>
@@ -119,6 +120,10 @@ you need multiple they should all have a path specified in the
<listitem><para>Login information for APT sources and proxies in a netrc-like format.
Configuration Item: <literal>Dir::Etc::netrc</literal>.</para></listitem>
</varlistentry>
+ <varlistentry><term><filename>/etc/apt/auth.conf.d/*.conf</filename></term>
+ <listitem><para>Login information for APT sources and proxies in a netrc-like format.
+ Configuration Item: <literal>Dir::Etc::netrcparts</literal>.</para></listitem>
+ </varlistentry>
</variablelist>
</refsect1>