Merge branch 'master' into dbtests

[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 16154a64dbaab4c92db2d91ca30fd46d4735f60c..b16d0c97c137712646ef04ee90fd3c2b695a8763 100644 (file)
--- a/config/debian-security/apt.conf.buildd
+++ b/config/debian-security/apt.conf.buildd
@@ -2,9 +2,9 @@ APT::FTPArchive::Contents off;
 
 Dir 
 {
-   ArchiveDir "/srv/security.debian.org/buildd/";
-   OverrideDir "/srv/security.debian.org/override/";
-   CacheDir "/srv/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
@@ -15,19 +15,6 @@ Default
    FileMode 0664;
 }
 
-bindirectory "etch"
-{
-   Packages "etch/Packages";
-   Sources "etch/Sources";
-   Contents " ";
-
-   BinOverride "override.etch.all3";
-   SrcOverride "override.etch.all3.src";
-   BinCacheDB "packages-accepted-etch.db";
-   PathPrefix "";
-   Packages::Extensions ".deb .udeb";
-};
-
 bindirectory "lenny"
 {
    Packages "lenny/Packages";
@@ -41,3 +28,15 @@ bindirectory "lenny"
    Packages::Extensions ".deb .udeb";
 };
 
+bindirectory "squeeze"
+{
+   Packages "squeeze/Packages";
+   Sources "squeeze/Sources";
+   Contents " ";
+
+   BinOverride "override.squeeze.all3";
+   SrcOverride "override.squeeze.all3.src";
+   BinCacheDB "packages-accepted-squeeze.db";
+   PathPrefix "";
+   Packages::Extensions ".deb .udeb";
+};