Merge with Michael and resolve conflicts

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

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 7d768dbf30059e9e3a1b6f4f68d063e8673f029a..f8abd75ed7e9863600cac66e5490ed6e4cd6d794 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -1,9 +1,9 @@
-// $Id: configure-index,v 1.5 2002/03/20 05:51:52 jgg Exp $
+// $Id: configure-index,v 1.10 2004/07/17 19:37:16 mdz Exp $
 /* This file is an index of all APT configuration directives. It should
-   NOT actually be used as a real config file, though it is a completely
-   valid file. Most of the options have sane default values, unless
-   you have specific needs you should NOT include arbitary items in a custom
-   configuration.
+   NOT actually be used as a real config file, though it is (except for the
+   last line) a completely valid file. Most of the options have sane default
+   values, unless you have specific needs you should NOT include arbitary
+   items in a custom configuration.
    
    In some instances involving filenames it is possible to set the default
    directory when the path is evaluated. This means you can use relative
@@ -17,6 +17,8 @@
    if an option is specified on the command line with -o.
 */
 
+quiet "0";
+
 // Options for APT in general
 APT 
 {
@@ -34,6 +36,7 @@ APT
      Fix-Broken "false";  
      Fix-Missing "false";     
      Show-Upgraded "false";
+     Show-Versions "false";
      Upgrade "true";
      Print-URIs "false";
      Compile "false";
@@ -43,6 +46,9 @@ APT
      ReInstall "false";
      Trivial-Only "false";
      Remove "true";
+     Only-Source "";
+     Diff-Only "false";
+     Tar-Only "false";
   };
 
   Cache 
@@ -50,7 +56,12 @@ APT
      Important "false";
      AllVersions "false";
      GivenOnly "false";
-     RecruseDepends "false";
+     RecurseDepends "false";
+     ShowFull "false";
+     Generate "true";
+     NamesOnly "false";
+     AllNames "false";
+     Installed "false";
   };
 
   CDROM 
@@ -61,12 +72,30 @@ APT
      NoAct "false";
   };
 
+  Authentication
+  {
+     TrustCDROM "false";            // consider the CDROM always trusted
+  };
+
+  GPGV
+  {
+     TrustedKeyring "/etc/apt/trusted.gpg";
+  };
+
   // Some general options
   Ignore-Hold "false";
   Clean-Installed "true";
   Immediate-Configure "true";      // DO NOT turn this off, see the man page
   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
@@ -88,6 +117,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
@@ -116,7 +146,7 @@ Acquire
   
   cdrom
   {
-    Mount "/cdrom";
+    mount "/cdrom";
 
     // You need the trailing slash!
     "/cdrom/"
@@ -125,6 +155,11 @@ Acquire
        UMount "sleep 500";
     }
   };
+
+  gpgv
+  {
+   Options {"--ignore-time-conflict";} // not very usefull on a normal system
+  };
 };
 
 // Directory layout
@@ -133,7 +168,7 @@ Dir "/"
   // Location of the state dir
   State "var/lib/apt/" 
   {
-     lists "lists/";
+     Lists "lists/";
      xstatus "xstatus";
      userstatus "status.user";
      status "/var/lib/dpkg/status";
@@ -142,25 +177,27 @@ Dir "/"
   
   // Location of the cache dir
   Cache "var/cache/apt/" {
-     archives "archives/";
+     Archives "archives/";
      srcpkgcache "srcpkgcache.bin";
      pkgcache "pkgcache.bin";     
   };
   
   // Config files
   Etc "etc/apt/" {
-     sourcelist "sources.list";
-     main "apt.conf";
-     preferences "preferences";     
+     SourceList "sources.list";
+     Main "apt.conf";
+     Preferences "preferences";     
+     Parts "apt.conf.d/";
   };
   
   // Locations of binaries
   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"
+     dpkg-buildpackage "/usr/bin/dpkg-buildpackage";
      apt-get "/usr/bin/apt-get";
      apt-cache "/usr/bin/apt-cache";
   };
@@ -192,10 +229,14 @@ DPkg
    Build-Options "-b -uc";
 
    // Pre-configure all packages before they are installed using debconf.
-   Pre-Install-Pkgs {"dpkg-preconfig --apt --priority=low --frontend=dialog";};
+   Pre-Install-Pkgs {"dpkg-preconfigure --apt --priority=low --frontend=dialog";};
 
    // Flush the contents of stdin before forking dpkg.
    FlushSTDIN "true";
+
+   // Control the size of the command line passed to dpkg.
+   MaxBytes 1024;
+   MaxArgs 350;
 }
 
 /* Options you can set to see some debugging text They correspond to names
@@ -203,16 +244,22 @@ DPkg
 Debug 
 {
   pkgProblemResolver "false";
+  pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgAcquire "false";
   pkgAcquire::Worker "false";
+  pkgAcquire::Auth "false";
   pkgDPkgPM "false";
+  pkgDPkgProgressReporting "false";
   pkgOrderList "false";
   
   pkgInitialize "false";   // This one will dump the configuration space
   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