X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fapt.conf.buildd;h=9647c635cb3e523c2b2baa76fe30f72589dc15e5;hb=1f6a57da8373f873c7b86c6ae3fb1e74c8a53f09;hp=94d2aa3d79206aad57815d28f867bc8ae3acbe98;hpb=17cec6a95a357324d0292155242310aed6757ebf;p=dak.git

diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd
index 94d2aa3d..9647c635 100644
--- a/config/debian-security/apt.conf.buildd
+++ b/config/debian-security/apt.conf.buildd
@@ -1,51 +1,42 @@
+APT::FTPArchive::Contents off;
+
 Dir 
 {
-   ArchiveDir "/org/security.debian.org/buildd/";
-   OverrideDir "/org/security.debian.org/override/";
-   CacheDir "/org/security.debian.org/dak-database/";
+   ArchiveDir "/srv/security-master.debian.org/buildd/";
+   OverrideDir "/srv/security-master.debian.org/override/";
+   CacheDir "/srv/security-master.debian.org/dak-database/";
 };
 
 Default
 {
-   Packages::Compress ". gzip";
-   Sources::Compress ". gzip";
+   Packages::Compress ". gzip bzip2";
+   Sources::Compress ". gzip bzip2";
    DeLinkLimit 0;
    FileMode 0664;
 }
 
-bindirectory "etch"
+bindirectory "squeeze"
 {
-   Packages "etch/Packages";
-   Sources "etch/Sources";
+   Packages "squeeze/Packages";
+   Sources "squeeze/Sources";
    Contents " ";
 
-   BinOverride "override.etch.all3";
-   BinCacheDB "packages-accepted-etch.db";
+   BinOverride "override.squeeze.all3";
+   SrcOverride "override.squeeze.all3.src";
+   BinCacheDB "packages-accepted-squeeze.db";
    PathPrefix "";
    Packages::Extensions ".deb .udeb";
 };
 
-bindirectory "woody"
+bindirectory "wheezy"
 {
-   Packages "woody/Packages";
-   Sources "woody/Sources";
+   Packages "wheezy/Packages";
+   Sources "wheezy/Sources";
    Contents " ";
 
-   BinOverride "override.woody.all3";
-   BinCacheDB "packages-accepted-woody.db";
+   BinOverride "override.wheezy.all3";
+   SrcOverride "override.wheezy.all3.src";
+   BinCacheDB "packages-accepted-squeeze.db";
    PathPrefix "";
    Packages::Extensions ".deb .udeb";
 };
-
-bindirectory "sarge"
-{
-   Packages "sarge/Packages";
-   Sources "sarge/Sources";
-   Contents " ";
-
-   BinOverride "override.sarge.all3";
-   BinCacheDB "packages-accepted-sarge.db";
-   PathPrefix "";
-   Packages::Extensions ".deb .udeb";
-};
-