[??] sync with ftp-master/dak master

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

diff --git a/config/debian/apt.conf.buildd b/config/debian/apt.conf.buildd
index 9ea04491014b1f9af89f081028c69324794ef384..2ad4483c2306be4e66161feec9f6d25f678c28e8 100644 (file)
--- a/config/debian/apt.conf.buildd
+++ b/config/debian/apt.conf.buildd
@@ -1,14 +1,14 @@
 Dir 
 {
-   ArchiveDir "/org/incoming.debian.org/buildd/";
-   OverrideDir "/org/ftp.debian.org/scripts/override/";
-   CacheDir "/org/ftp.debian.org/database/";
+   ArchiveDir "/srv/incoming.debian.org/buildd/";
+   OverrideDir "/srv/ftp.debian.org/scripts/override/";
+   CacheDir "/srv/ftp.debian.org/database/";
 };
 
 Default
 {
-   Packages::Compress "gzip";
-   Sources::Compress "gzip";
+   Packages::Compress "bzip2 gzip";
+   Sources::Compress "bzip2 gzip";
    DeLinkLimit 0;
    FileMode 0664;
 }
@@ -21,7 +21,7 @@ bindirectory "incoming"
    BinOverride "override.sid.all3";
    BinCacheDB "packages-accepted.db";
    
-   FileList "/org/ftp.debian.org/database/dists/unstable_accepted.list";
+   FileList "/srv/ftp.debian.org/database/dists/unstable_accepted.list";
 
    PathPrefix "";
    Packages::Extensions ".deb .udeb";
@@ -32,6 +32,6 @@ bindirectory "incoming/"
    Sources "Sources";
    BinOverride "override.sid.all3";
    SrcOverride "override.sid.all3.src";
-   SourceFileList "/org/ftp.debian.org/database/dists/unstable_accepted.list";
+   FileList "/srv/ftp.debian.org/database/dists/unstable_accepted.list";
 };