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 a4167085b7310d50d68fe6bdf2b33644c2bf4af4..ddee863883eb6c0965d0fc6402c5c7f6fb61a79a 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -55,6 +55,7 @@ APT
      Diff-Only "false";
      Tar-Only "false";
      Build-Dep-Automatic "true";
      Diff-Only "false";
      Tar-Only "false";
      Build-Dep-Automatic "true";

+     Show-User-Simulation-Note "true";

   };
 
   Cache 
   };
 
   Cache 


@@ -89,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";


@@ -175,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 
   {


@@ -190,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


@@ -231,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!


@@ -245,6 +266,15 @@ Acquire
   {
    Options {"--ignore-time-conflict";} // not very useful on a normal system
   };
   {
    Options {"--ignore-time-conflict";} // not very useful on a normal system
   };

+
+  CompressionTypes
+  {
+    bz2 "bzip2";
+    lzma "lzma";
+    gz "gzip";
+
+    Order { "gz"; "lzma"; "bz2"; };
+  };

 };
 
 // Directory layout
 };
 
 // Directory layout


@@ -271,10 +301,17 @@ Dir "/"
   
   // Config files
   Etc "etc/apt/" {
   
   // Config files
   Etc "etc/apt/" {

-     SourceList "sources.list";

      Main "apt.conf";
      Main "apt.conf";

-     Preferences "preferences";     
+     Netrc "auth.conf";

      Parts "apt.conf.d/";
      Parts "apt.conf.d/";

+     Preferences "preferences";
+     PreferencesParts "preferences.d";
+     SourceList "sources.list";
+     SourceParts "sources.list.d";
+     VendorList "vendors.list";
+     VendorParts "vendors.list.d";
+     Trusted "trusted.gpg";
+     TrustedParts "trusted.gpg.d";

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


@@ -293,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


@@ -305,18 +349,25 @@ DSelect
    CheckDir "no";
 }
 
    CheckDir "no";
 }
 

-DPkg 
+DPkg

 {
 {

+   // let apt aggressivly use dpkg triggers
+   NoTriggers "true";
+   NoConfigure "true";
+   ConfigurePending "true";
+

    // Probably don't want to use force-downgrade..
    Options {"--force-overwrite";"--force-downgrade";}
    // Probably don't want to use force-downgrade..
    Options {"--force-overwrite";"--force-downgrade";}

-   
+

    // Auto re-mounting of a readonly /usr
    Pre-Invoke {"mount -o remount,rw /usr";};
    Post-Invoke {"mount -o remount,ro /usr";};
    // Auto re-mounting of a readonly /usr
    Pre-Invoke {"mount -o remount,rw /usr";};
    Post-Invoke {"mount -o remount,ro /usr";};

-   
+
+   Chroot-Directory "/";
+

    // Prevents daemons from getting cwd as something mountable (default)
    Run-Directory "/";
    // Prevents daemons from getting cwd as something mountable (default)
    Run-Directory "/";

-   
+

    // Build options for apt-get source --compile
    Build-Options "-b -uc";
 
    // Build options for apt-get source --compile
    Build-Options "-b -uc";
 


@@ -340,7 +391,10 @@ DPkg
 Debug 
 {
   pkgProblemResolver "false";
 Debug 
 {
   pkgProblemResolver "false";

+  pkgProblemResolver::ShowScores "false";

   pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   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";


@@ -357,6 +411,7 @@ Debug
   Acquire::gpgv "false";   // Show the gpgv traffic
   aptcdrom "false";        // Show found package files
   IdentCdrom "false";
   Acquire::gpgv "false";   // Show the gpgv traffic
   aptcdrom "false";        // Show found package files
   IdentCdrom "false";

+  acquire::netrc "false";  // netrc parser

   
 }
 
   
 }