summaryrefslogtreecommitdiff
path: root/doc/apt_auth.conf.5.xml
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2018-12-04 20:14:45 +0000
committerJulian Andres Klode <jak@debian.org>2018-12-04 20:14:45 +0000
commit294b5e77a25d2600e7f3ce12a996d1694b5be817 (patch)
tree4282524f2298dfd2b9af869ae70e48b940c6d9d7 /doc/apt_auth.conf.5.xml
parent37bdbe03d44975951d2518bb9b3d3636081dca6a (diff)
parentbbfcc05c1978decd28df9681fd73e2a7d9a8c2a5 (diff)
Merge branch 'pu/netrcparts' into 'master'
Add support for /etc/apt/auth.conf.d/*.conf (netrcparts) See merge request apt-team/apt!37
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 37e4fbc98..26d14b8e8 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>