Merge remote branch 'tolimar/tolimar-adopt-bts-categorize' into merge

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 2e1eb3bbd227df52224c53c1b6a1069520a4bf67..648be641f49d898e5982613c92fa62f0470fb6c3 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -64,20 +64,6 @@ Override
    MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
 };
 
-Mirror-Split
-{
-  FTPPath "/srv/ftp-master.debian.org/ftp";
-  TreeRootPath "/srv/ftp-master.debian.org/scratch/dsilvers/treeroots";
-  TreeDatabasePath "/srv/ftp-master.debian.org/scratch/dsilvers/treedbs";
-  BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; };
-  CombinationTrees
-  {
-    popular { i386; powerpc; all; source; };
-    source { source; };
-    everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; };
-  };
-};
-
 Show-New
 {
   HTMLPath "/srv/ftp.debian.org/web/new/";
@@ -86,7 +72,7 @@ Show-New
 Show-Deferred
 {
   LinkPath "/srv/ftp.debian.org/web/deferred/";
-  DeferredQueue "/srv/queued/DEFERRED/";
+  DeferredQueue "/srv/upload.debian.org/DEFERRED/";
 }
 
 Import-Users-From-Passwd
@@ -126,6 +112,7 @@ Rm
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
    LogFile "/srv/ftp.debian.org/web/removals.txt";
+   LogFile822 "/srv/ftp.debian.org/web/removals.822";
    Bcc "removed-packages@qa.debian.org";
 };
 
@@ -582,6 +569,7 @@ Dir
   Templates "/srv/ftp-master.debian.org/dak/templates/";
   PoolRoot "pool/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
+  Cache "/srv/ftp-master.debian.org/database/";
   Log "/srv/ftp-master.debian.org/log/";
   Lock "/srv/ftp-master.debian.org/lock";
   Morgue "/srv/ftp-master.debian.org/morgue/";
@@ -787,3 +775,10 @@ Common
   // The default number of threads for multithreading parts of dak:
   ThreadCount 16;
 }
+
+Changelogs
+{
+  Testing "/srv/release.debian.org/tools/trille/current-testing";
+  Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog";
+  Export "/srv/ftp-master.debian.org/export/changelogs";
+}