sync debian-security config from klecker

[dak.git] / config / debian-security / apt.conf.buildd

diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd
index 463887403d723ed8cd296d900d03b914f8957468..0285236e3ffedc31e0139fb03dc43c74efd13dec 100644 (file)
--- a/config/debian-security/apt.conf.buildd
+++ b/config/debian-security/apt.conf.buildd
@@ -1,14 +1,16 @@
+APT::FTPArchive::Contents off;
+
 Dir 
 {
-   ArchiveDir "/org/security.debian.org/buildd/";
-   OverrideDir "/org/security.debian.org/override/";
-   CacheDir "/org/security.debian.org/katie-database/";
+   ArchiveDir "/srv/security.debian.org/buildd/";
+   OverrideDir "/srv/security.debian.org/override/";
+   CacheDir "/srv/security.debian.org/dak-database/";
 };
 
 Default
 {
-   Packages::Compress ". gzip";
-   Sources::Compress ". gzip";
+   Packages::Compress ". gzip bzip2";
+   Sources::Compress ". gzip bzip2";
    DeLinkLimit 0;
    FileMode 0664;
 }
@@ -20,19 +22,21 @@ bindirectory "etch"
    Contents " ";
 
    BinOverride "override.etch.all3";
+   SrcOverride "override.etch.all3.src";
    BinCacheDB "packages-accepted-etch.db";
    PathPrefix "";
    Packages::Extensions ".deb .udeb";
 };
 
-bindirectory "woody"
+bindirectory "lenny"
 {
-   Packages "woody/Packages";
-   Sources "woody/Sources";
+   Packages "lenny/Packages";
+   Sources "lenny/Sources";
    Contents " ";
 
-   BinOverride "override.woody.all3";
-   BinCacheDB "packages-accepted-woody.db";
+   BinOverride "override.lenny.all3";
+   SrcOverride "override.lenny.all3.src";
+   BinCacheDB "packages-accepted-lenny.db";
    PathPrefix "";
    Packages::Extensions ".deb .udeb";
 };
@@ -44,6 +48,7 @@ bindirectory "sarge"
    Contents " ";
 
    BinOverride "override.sarge.all3";
+   SrcOverride "override.sarge.all3.src";
    BinCacheDB "packages-accepted-sarge.db";
    PathPrefix "";
    Packages::Extensions ".deb .udeb";