[rmurray] Migrate from /org to /srv for debian.org config.

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

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 564a758ca5a28f49a444b45ee7fec3256c25ae35..4ec1cd2cead93c79d2543772b888a3540a172392 100644 (file)
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -1,8 +1,8 @@
 Dir 
 {
-   ArchiveDir "/org/ftp.debian.org/ftp/";
-   OverrideDir "/org/ftp.debian.org/scripts/override/";
-   CacheDir "/org/ftp.debian.org/database/";
+   ArchiveDir "/srv/ftp.debian.org/ftp/";
+   OverrideDir "/srv/ftp.debian.org/scripts/override/";
+   CacheDir "/srv/ftp.debian.org/database/";
 };
 
 Default
@@ -17,13 +17,13 @@ Default
 
 TreeDefault
 {
-   Contents::Header "/org/ftp.debian.org/dak/config/debian/Contents.top";
+   Contents::Header "/srv/ftp.debian.org/dak/config/debian/Contents.top";
 };
 
 tree "dists/proposed-updates"
 {
-   FileList "/org/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_source.list";
+   FileList "/srv/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
    BinOverride "override.sarge.$(SECTION)";
@@ -35,8 +35,8 @@ tree "dists/proposed-updates"
 tree "dists/testing"
 {
    FakeDI "dists/unstable";
-   FileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_source.list";
+   FileList "/srv/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp.debian.org/database/dists/testing_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
    BinOverride "override.etch.$(SECTION)";
@@ -48,8 +48,8 @@ tree "dists/testing"
 
 tree "dists/testing-proposed-updates"
 {
-   FileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
+   FileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
    BinOverride "override.etch.$(SECTION)";
@@ -60,8 +60,8 @@ tree "dists/testing-proposed-updates"
 
 tree "dists/unstable"
 {
-   FileList "/org/ftp.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list";
+   FileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source";
    BinOverride "override.sid.$(SECTION)";
@@ -75,7 +75,7 @@ tree "dists/unstable"
 
 tree "dists/proposed-updates/main"
 {
-   FileList "/org/ftp.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc";
    BinOverride "override.sarge.main.$(SECTION)";
@@ -87,7 +87,7 @@ tree "dists/proposed-updates/main"
 
 tree "dists/testing/main"
 {
-   FileList "/org/ftp.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc";
    BinOverride "override.etch.main.$(SECTION)";
@@ -99,7 +99,7 @@ tree "dists/testing/main"
 
 tree "dists/testing-proposed-updates/main"
 {
-   FileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc";
    BinOverride "override.etch.main.$(SECTION)";
@@ -111,7 +111,7 @@ tree "dists/testing-proposed-updates/main"
 
 tree "dists/unstable/main"
 {
-   FileList "/org/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
    BinOverride "override.sid.main.$(SECTION)";
@@ -125,8 +125,8 @@ tree "dists/unstable/main"
 
 tree "dists/experimental"
 {
-   FileList "/org/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/experimental_$(SECTION)_source.list";
+   FileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source";
    BinOverride "override.sid.$(SECTION)";