* merged from mainline

[apt.git] / doc / examples / configure-index

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 3538deebd9c37cc94c826be39a502056977f7b2d..62858742795e0b184aaea915a37f5b156738187e 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -72,6 +72,11 @@ APT
      NoAct "false";
   };
 
+  Authentication
+  {
+     TrustCDROM "false";            // consider the CDROM always trusted
+  };
+
   GPGV
   {
      TrustedKeyring "/etc/apt/trusted.gpg";
@@ -84,6 +89,13 @@ APT
   Force-LoopBreak "false";         // DO NOT turn this on, see the man page
   Cache-Limit "4194304";
   Default-Release "";
+
+
+  // Write progress messages on this fd (for stuff like base-config)
+  Status-Fd "-1";
+  // Keep the list of FDs open (normally apt closes all fds when it
+  // does a ExecFork)
+  Keep-Fds {};
 };
 
 // Options for the downloading routines
@@ -92,6 +104,8 @@ Acquire
   Queue-Mode "host";       // host|access
   Retries "0";
   Source-Symlinks "true";
+
+  PDiffs "true";     // try to get the IndexFile diffs
   
   // HTTP method configuration
   http 
@@ -105,6 +119,7 @@ Acquire
     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
   };
 
   ftp
@@ -184,7 +199,7 @@ Dir "/"
      gpg  "/usr/bin/gpgv";
      dpkg "/usr/bin/dpkg";
      dpkg-source "/usr/bin/dpkg-source";
-     dpkg-buildpackage "/usr/bin/dpkg-buildpackage"
+     dpkg-buildpackage "/usr/bin/dpkg-buildpackage";
      apt-get "/usr/bin/apt-get";
      apt-cache "/usr/bin/apt-cache";
   };
@@ -231,9 +246,11 @@ DPkg
 Debug 
 {
   pkgProblemResolver "false";
+  pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgDPkgPM "false";
+  pkgDPkgProgressReporting "false";
   pkgOrderList "false";
   
   pkgInitialize "false";   // This one will dump the configuration space