X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=b2da1f823043ab32d99e5ec7c00509f9f6a164d2;hb=2420770a08598ee320c813964cfb3bcb42171bd5;hp=2e1eb3bbd227df52224c53c1b6a1069520a4bf67;hpb=317c4c7f173540de71907f1e527437d88f48a3b9;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 2e1eb3bb..b2da1f82 100644
--- 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";
 };
 
@@ -216,11 +203,6 @@ Suite
 	OverrideCodeName "lenny";
 	Priority "5";
 	ChangeLogBase "dists/stable/";
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Proposed-Updates
@@ -261,72 +243,6 @@ Suite
 	    Stable;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
-  };
-
-  Lenny-Volatile
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Announce "debian-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Volatile Packages for Debian 5.0";
-	CodeName "lenny-volatile";
-	OverrideCodeName "lenny";
-	OverrideSuite "stable";
-	ValidTime 604800; // 7 days
-	NotAutomatic "yes";
-	Priority "0";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Stable;
-	  };
-	  Enhances
-      {
-	    Stable;
-	  };
-	};
-
-  };
-
-  Lenny-Volatile-Proposed-Updates
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Announce "debian-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Proposed Volatile Packages for Debian 5.0";
-	CodeName "lenny-volatile-proposed-updates";
-	OverrideCodeName "lenny";
-	OverrideSuite "stable";
-	ValidTime 604800; // 7 days
-	NotAutomatic "yes";
-	Priority "0";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Stable;
-	  };
-	  Enhances
-      {
-	    Stable;
-	  };
-	};
   };
 
   Testing
@@ -344,11 +260,6 @@ Suite
 	OverrideCodeName "squeeze";
 	ValidTime 604800; // 7 days
 	Priority "5";
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Testing-Proposed-Updates
@@ -386,11 +297,6 @@ Suite
 	    Testing;
           };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Squeeze-Volatile
@@ -425,37 +331,6 @@ Suite
 
   };
 
-  Squeeze-Volatile-Proposed-Updates
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Announce "debian-testing-changes@lists.debian.org";
-	Origin "Debian";
-	Description "Proposed Volatile Packages for Debian x.y (testing)";
-	CodeName "squeeze-volatile-proposed-updates";
-	OverrideCodeName "squeeze";
-	OverrideSuite "testing";
-	ValidTime 604800; // 7 days
-	NotAutomatic "yes";
-	Priority "0";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Stable;
-	    Testing;
-	  };
-	  Enhances
-      {
-	    Testing;
-	  };
-	};
-  };
-
   Unstable
   {
 	Components
@@ -482,11 +357,6 @@ Suite
 	    Testing-Proposed-Updates;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Experimental
@@ -518,11 +388,6 @@ Suite
 	    Unstable;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
 };
@@ -582,6 +447,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 +653,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";
+}