* [BREAK] merged lp:~mvo/apt/history

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

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 05826feaaccafb22eebcb573c6834f799ae9ae7d..f07302efd4c0c56e26b77b202f62cec4196753b5 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 
   {


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


@@ -309,6 +311,7 @@ Dir "/"
   // Config files
   Etc "etc/apt/" {
      Main "apt.conf";
   // Config files
   Etc "etc/apt/" {
      Main "apt.conf";

+     Netrc "auth.conf";

      Parts "apt.conf.d/";
      Preferences "preferences";
      PreferencesParts "preferences.d";
      Parts "apt.conf.d/";
      Preferences "preferences";
      PreferencesParts "preferences.d";


@@ -316,6 +319,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


@@ -333,6 +338,21 @@ Dir "/"
   // Location of the logfile
   Log "var/log/apt" {
        Terminal "term.log";
   // Location of the logfile
   Log "var/log/apt" {
        Terminal "term.log";

+       History "history.log";
+  };
+
+  // Media 
+  Media 
+  {
+       // Media AutoDetect mount path
+       MountPath "/media/apt";
+  };
+
+  // Media 
+  Media 
+  {
+       // Media AutoDetect mount path
+       MountPath "/media/apt";

   };
 };
 
   };
 };
 


@@ -391,6 +411,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";


@@ -407,6 +428,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

   
 }
 
   
 }