Local security-master changes

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

diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index fcaa611348f265c5db5390ff1f68da52348a1468..444e6804dd870e030edbb9489144e8057821ab63 100644 (file)
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -2,9 +2,9 @@ APT::FTPArchive::Contents off;
 
 Dir 
 {
-   ArchiveDir "/org/security.debian.org/ftp/";
-   OverrideDir "/org/security.debian.org/override/";
-   CacheDir "/org/security.debian.org/dak-database/";
+   ArchiveDir "/srv/security-master.debian.org/ftp/";
+   OverrideDir "/srv/security-master.debian.org/override/";
+   CacheDir "/srv/security-master.debian.org/dak-database/";
 };
 
 Default
@@ -17,8 +17,8 @@ Default
 
 tree "dists/oldstable/updates"
 {
-   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";
+   FileList "/srv/security-master.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/security-master.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.etch.$(SECTION)";
@@ -31,8 +31,8 @@ tree "dists/oldstable/updates"
 
 tree "dists/stable/updates"
 {
-   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";
+   FileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.lenny.$(SECTION)";
@@ -45,10 +45,10 @@ tree "dists/stable/updates"
 
 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";
+   FileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+   Architectures "alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.squeeze.$(SECTION)";
    ExtraOverride "override.squeeze.extra.$(SECTION)";
    SrcOverride "override.squeeze.$(SECTION).src";