Make apt proxy options have the highest priority, unified proxy determining code.

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

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index ab3657a586e595feef45864d050013bee62466dc..db07f189ee84096b40a8390b9acd617c8c852ce9 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -1,8 +1,7 @@
-// $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 (except for the
    last line) a completely valid file. Most of the options have sane default
 /* This file is an index of all APT configuration directives. It should
    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
+   values, unless you have specific needs you should NOT include arbitrary

    items in a custom configuration.
    
    In some instances involving filenames it is possible to set the default
    items in a custom configuration.
    
    In some instances involving filenames it is possible to set the default


@@ -25,13 +24,14 @@ APT
   Architecture "i386";
   Build-Essential "build-essential";
 
   Architecture "i386";
   Build-Essential "build-essential";
 

-  NeverAutoRemove  { "linux-kernel.*";  };  // packages that should never
+  NeverAutoRemove  { "linux-image.*";  };  // packages that should never

                                             // considered for autoRemove
 
   // Options for apt-get
   Get 
   {
      Arch-Only "false";
                                             // considered for autoRemove
 
   // Options for apt-get
   Get 
   {
      Arch-Only "false";

+     AllowUnauthenticated "false";

      AutomaticRemove "false";       
      HideAutoRemove "false";
      Download-Only "false";
      AutomaticRemove "false";       
      HideAutoRemove "false";
      Download-Only "false";


@@ -54,6 +54,7 @@ APT
      Only-Source "";
      Diff-Only "false";
      Tar-Only "false";
      Only-Source "";
      Diff-Only "false";
      Tar-Only "false";

+     Build-Dep-Automatic "true";

   };
 
   Cache 
   };
 
   Cache 


@@ -77,6 +78,12 @@ APT
      NoAct "false";
   };
 
      NoAct "false";
   };
 

+  Update
+  {
+     Pre-Invoke {"touch /var/lib/apt/pre-update-stamp"; };
+     Post-Invoke {"touch /var/lib/apt/post-update-stamp"; };
+  };
+

   Authentication
   {
      TrustCDROM "false";            // consider the CDROM always trusted
   Authentication
   {
      TrustCDROM "false";            // consider the CDROM always trusted


@@ -97,7 +104,7 @@ APT
 
   // consider Recommends, Suggests as important dependencies that should
   // be installed by default
 
   // consider Recommends, Suggests as important dependencies that should
   // be installed by default

-  Install-Recommends "false";
+  Install-Recommends "true";

   Install-Suggests "false";
 
   // consider dependencies of packages in this section manual
   Install-Suggests "false";
 
   // consider dependencies of packages in this section manual


@@ -164,7 +171,7 @@ Acquire
     Timeout "120";
     
     /* Passive mode control, proxy, non-proxy and per-host. Pasv mode
     Timeout "120";
     
     /* Passive mode control, proxy, non-proxy and per-host. Pasv mode

-       is prefered if possible */
+       is preferred if possible */

     Passive "true";
     Proxy::Passive "true";
     Passive::http.us.debian.org "true"; // Specific per-host setting
     Passive "true";
     Proxy::Passive "true";
     Passive::http.us.debian.org "true"; // Specific per-host setting


@@ -184,7 +191,7 @@ Acquire
 
   gpgv
   {
 
   gpgv
   {

-   Options {"--ignore-time-conflict";} // not very usefull on a normal system
+   Options {"--ignore-time-conflict";} // not very useful on a normal system

   };
 };
 
   };
 };
 


@@ -227,6 +234,11 @@ Dir "/"
      apt-get "/usr/bin/apt-get";
      apt-cache "/usr/bin/apt-cache";
   };
      apt-get "/usr/bin/apt-get";
      apt-cache "/usr/bin/apt-cache";
   };

+
+  // Location of the logfile
+  Log "var/log/apt" {
+       Terminal "term.log";
+  };

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