X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=6db8add5e7e0bfb9fd23f3c49a88c8b66d328686;hb=7a966c081f8e4b83d1cf4dc4b8cb7ebb0f06dd30;hp=5252788ba4f66d10aeb2ec3420f977af069de4b6;hpb=db85f96a1c306398736f64ff3d14cda61d206654;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 5252788b..6db8add5 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; m68k };
-  CombinationTrees
-  {
-    popular { i386; powerpc; all; source; };
-    source { source; };
-    everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k; };
-  };
-};
-
 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
@@ -125,7 +111,8 @@ Rm
    };
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/srv/ftp-master.debian.org/web/removals.txt";
+   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,11 +243,6 @@ Suite
 	    Stable;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Testing
@@ -283,11 +260,6 @@ Suite
 	OverrideCodeName "squeeze";
 	ValidTime 604800; // 7 days
 	Priority "5";
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Testing-Proposed-Updates
@@ -325,11 +297,38 @@ Suite
 	    Testing;
           };
 	};
-	UdebComponents
+  };
+
+  Squeeze-Volatile
+  {
+	Components
 	{
 	  main;
+	  contrib;
 	  non-free;
 	};
+	Announce "debian-testing-changes@lists.debian.org";
+	Origin "Debian";
+	Description "Volatile Packages for Debian x.y (testing)";
+	CodeName "squeeze-volatile";
+	OverrideCodeName "squeeze";
+	OverrideSuite "testing";
+	ValidTime 604800; // 7 days
+	NotAutomatic "yes";
+	Priority "0";
+	VersionChecks
+	{
+	  MustBeNewerThan
+	  {
+	    Stable;
+	    Testing;
+	  };
+	  Enhances
+      {
+	    Testing;
+	  };
+	};
+
   };
 
   Unstable
@@ -358,11 +357,6 @@ Suite
 	    Testing-Proposed-Updates;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
   Experimental
@@ -394,11 +388,6 @@ Suite
 	    Unstable;
 	  };
 	};
-	UdebComponents
-	{
-	  main;
-	  non-free;
-	};
   };
 
 };
@@ -456,6 +445,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/";
@@ -469,6 +459,7 @@ Dir
     Byhand "/srv/ftp-master.debian.org/queue/byhand/";
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
     OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
+    ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
     Done "/srv/ftp-master.debian.org/queue/done/";
     Holding "/srv/ftp-master.debian.org/queue/holding/";
     New "/srv/ftp-master.debian.org/queue/new/";
@@ -494,7 +485,7 @@ DB
 {
   Name "projectb";
   Host "";
-  Port -1;
+  Port 5433;
 };
 
 Architectures
@@ -509,7 +500,6 @@ Architectures
   armel "ARM eabi";
   i386 "Intel ia32";
   ia64 "Intel ia64";
-  m68k "Motorola Mc680x0";
   mips "MIPS (Big Endian)";
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
@@ -653,3 +643,16 @@ Contents
   Header "contents";
   Root "/srv/ftp-master.debian.org/test/";
 }
+
+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";
+}