merge 1695..1701 from the lp:~mvo/apt/mvo branch

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

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index f5f9964609282e6d75c4ae562b192f0bc52da9b6..ddee863883eb6c0965d0fc6402c5c7f6fb61a79a 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -90,11 +90,6 @@ APT
      TrustCDROM "false";            // consider the CDROM always trusted
   };
 
      TrustCDROM "false";            // consider the CDROM always trusted
   };
 

-  GPGV
-  {
-     TrustedKeyring "/etc/apt/trusted.gpg";
-  };
-

   // Some general options
   Ignore-Hold "false";
   Clean-Installed "true";
   // Some general options
   Ignore-Hold "false";
   Clean-Installed "true";


@@ -176,7 +171,10 @@ Acquire
   Source-Symlinks "true";
 
   PDiffs "true";     // try to get the IndexFile diffs
   Source-Symlinks "true";
 
   PDiffs "true";     // try to get the IndexFile diffs

-  
+  PDiffs::FileLimit "4"; // don't use diffs if we would need more than 4 diffs
+  PDiffs::SizeLimit "50"; // don't use diffs if size of all patches excess
+                         // 50% of the size of the original file
+

   // HTTP method configuration
   http 
   {
   // HTTP method configuration
   http 
   {


@@ -191,19 +189,37 @@ Acquire
     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
     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

+    User-Agent "Debian APT-HTTP/1.3";

   };
 
   };
 

-  // HTTPS method configuration:
-  // - uses the http proxy config 
-  // - uses the http cache-control values
-  // - uses the http Dl-Limit values
-  https 
+
+
+  // HTTPS method configuration: uses the http
+  // - proxy config
+  // - cache-control values
+  // - Dl-Limit, Timout, ... values
+  // if not set explicit for https
+  //
+  // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz
+  // for more examples
+  https

   {
        Verify-Peer "false";
        SslCert "/etc/apt/some.pem";
   {
        Verify-Peer "false";
        SslCert "/etc/apt/some.pem";

-        CaPath  "/etc/ssl/certs";
-        Verify-Host" "true";
-        AllowRedirect  "true";
+       CaPath  "/etc/ssl/certs";
+       Verify-Host" "true";
+       AllowRedirect  "true";
+
+       Timeout "120";
+       AllowRedirect  "true";
+
+       // Cache Control. Note these do not work with Squid 2.0.2
+       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
+
+       User-Agent "Debian APT-CURL/1.0";

   };
 
   ftp
   };
 
   ftp


@@ -232,6 +248,10 @@ Acquire
   
   cdrom
   {
   
   cdrom
   {

+    // do auto detection of the cdrom mountpoint
+    AutoDetect "true";
+    
+    // cdrom mountpoint (needs to be defined in fstab if AutoDetect is not used)

     mount "/cdrom";
 
     // You need the trailing slash!
     mount "/cdrom";
 
     // You need the trailing slash!


@@ -290,6 +310,8 @@ Dir "/"
      SourceParts "sources.list.d";
      VendorList "vendors.list";
      VendorParts "vendors.list.d";
      SourceParts "sources.list.d";
      VendorList "vendors.list";
      VendorParts "vendors.list.d";

+     Trusted "trusted.gpg";
+     TrustedParts "trusted.gpg.d";

   };
   
   // Locations of binaries
   };
   
   // Locations of binaries


@@ -308,6 +330,13 @@ Dir "/"
   Log "var/log/apt" {
        Terminal "term.log";
   };
   Log "var/log/apt" {
        Terminal "term.log";
   };

+
+  // Media 
+  Media 
+  {
+       // Media AutoDetect mount path
+       MountPath "/media/apt";
+  };

 };
 
 // Things that effect the APT dselect method
 };
 
 // Things that effect the APT dselect method


@@ -365,6 +394,7 @@ Debug
   pkgProblemResolver::ShowScores "false";
   pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgDepCache::Marker "false"; 
   pkgProblemResolver::ShowScores "false";
   pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgDepCache::Marker "false"; 

+  pkgCacheGen "false";

   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgAcquire::Auth "false";
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgAcquire::Auth "false";