summaryrefslogtreecommitdiff
path: root/doc/examples
diff options
context:
space:
mode:
authorMatt Zimmerman <matt.zimmerman@canonical.com>2005-02-26 23:22:32 +0000
committerMatt Zimmerman <matt.zimmerman@canonical.com>2005-02-26 23:22:32 +0000
commitf827a9e553ac84e70cba573b071e6a1891ec40d5 (patch)
treef90f98f49affd55d635d9ea729f6dbc3aaa7e754 /doc/examples
parentaf45f087e2a08534d1df8ec481d2688d0fbafe7b (diff)
parent872b3d3983839d2d9f14268c5adf976a72ecc5ad (diff)
Merge apt--mvo--0
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-2 * merge with matts tree, added documentation for the gpgv stuff * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-3 * added gpgv::Options to configure-index * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-4 * PulseIntervall can be configured now to make frontends like synaptic hayppy. it's done in a way that does not break binary compatibility * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-5 * fix for apt-get update removing the cdroms Release.gpg files * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-6 * path scoring changed, the non-symlink path is scored highest
Diffstat (limited to 'doc/examples')
-rw-r--r--doc/examples/configure-index13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 7cb29f082..3538deebd 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -72,6 +72,11 @@ APT
NoAct "false";
};
+ GPGV
+ {
+ TrustedKeyring "/etc/apt/trusted.gpg";
+ };
+
// Some general options
Ignore-Hold "false";
Clean-Installed "true";
@@ -137,6 +142,11 @@ Acquire
UMount "sleep 500";
}
};
+
+ gpgv
+ {
+ Options {"--ignore-time-conflict";} // not very usefull on a normal system
+ };
};
// Directory layout
@@ -171,6 +181,7 @@ Dir "/"
Bin {
methods "/usr/lib/apt/methods/";
gzip "/bin/gzip";
+ gpg "/usr/bin/gpgv";
dpkg "/usr/bin/dpkg";
dpkg-source "/usr/bin/dpkg-source";
dpkg-buildpackage "/usr/bin/dpkg-buildpackage"
@@ -229,8 +240,10 @@ Debug
NoLocking "false";
Acquire::Ftp "false"; // Show ftp command traffic
Acquire::Http "false"; // Show http command traffic
+ Acquire::gpgv "false"; // Show the gpgv traffic
aptcdrom "false"; // Show found package files
IdentCdrom "false";
+
}
/* Whatever you do, do not use this configuration file!! Take out ONLY