X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fapt.conf;h=41b10ef11e5b0ccd2aec7bd15ba15c7643086c1a;hb=35e475f626c00d511b54e5002c58ad3d4e213afd;hp=f792f23d00c73973c8cf90b840d31eb0cbb10454;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git

diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index f792f23d..41b10ef1 100644
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -1,34 +1,24 @@
+APT::FTPArchive::Contents off;
+
 Dir 
 {
    ArchiveDir "/org/security.debian.org/ftp/";
    OverrideDir "/org/security.debian.org/override/";
-   CacheDir "/org/security.debian.org/katie-database/";
+   CacheDir "/org/security.debian.org/dak-database/";
 };
 
 Default
 {
-   Packages::Compress ". gzip";
-   Sources::Compress "gzip";
+   Packages::Compress ". gzip bzip2";
+   Sources::Compress "gzip bzip2";
    DeLinkLimit 0;
    FileMode 0664;
 }
 
 tree "dists/oldstable/updates"
 {
-   FileList "/org/security.debian.org/katie-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/security.debian.org/katie-database/dists/oldstable_updates/$(SECTION)_source.list";
-   Sections "main contrib non-free";
-   Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   ExtraOverride "override.woody.extra.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
-   Contents " ";
-};
-
-tree "dists/stable/updates"
-{
-   FileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_source.list";
+   FileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
    BinOverride "override.sarge.$(SECTION)";
@@ -37,14 +27,30 @@ tree "dists/stable/updates"
    Contents " ";
 };
 
-tree "dists/testing/updates"
+tree "dists/stable/updates"
 {
-   FileList "/org/security.debian.org/katie-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/security.debian.org/katie-database/dists/testing_updates/$(SECTION)_source.list";
+   FileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
+   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.etch.$(SECTION)";
    ExtraOverride "override.etch.extra.$(SECTION)";
    SrcOverride "override.etch.$(SECTION).src";
    Contents " ";
+   Packages::Compress "gzip bzip2";
+   Sources::Compress "gzip bzip2";
+};
+
+tree "dists/testing/updates"
+{
+   FileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+   BinOverride "override.lenny.$(SECTION)";
+   ExtraOverride "override.lenny.extra.$(SECTION)";
+   SrcOverride "override.lenny.$(SECTION).src";
+   Contents " ";
+   Packages::Compress "gzip bzip2";
+   Sources::Compress "gzip bzip2";
 };