diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-04 13:45:14 +0100 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-04 13:45:14 +0100 |
commit | c24f6ce22cd6720004addad2e3382b3caa6b1b7c (patch) | |
tree | f9b6374f21ab733a633b52e0fc26bb4dac461aca /doc/apt.ent | |
parent | 52643bec17df4e36a9bd27183886e2c0c7a8ebd8 (diff) |
add TrustedParts so in the future new keyrings can just be dropped
into /etc/apt/trusted.gpg.d/ which eliminates the need to have
gpg installed to add keys to APTs trusted keyring (with apt-key)
(Closes #304846) - Thanks to Timo Weingärtner & Peter Palfrader
for providing different patchs/ideas for this!
Diffstat (limited to 'doc/apt.ent')
-rw-r--r-- | doc/apt.ent | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/apt.ent b/doc/apt.ent index 0b341ec14..da43d8f3d 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -353,3 +353,16 @@ Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem> </varlistentry> "> + +<!ENTITY file-trustedgpg " + <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term> + <listitem><para>Keyring of local trusted keys, new keys will be added here. + Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem> + </varlistentry> + + <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term> + <listitem><para>File fragments for the trusted keys, additional keyrings can + be stored here (by other packages or the administrator). + Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem> + </varlistentry> +"> |