X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=98da875cf185f2af03a8bda2bd9f1a52cbd44194;hb=0872b2e0b78670c91fd2bf0bda52e5761e079820;hp=243df1ccc247321bdbd189927b9b86d63183ba3c;hpb=5346df212cbb35a97fe5a5561741bed14e50aa38;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 243df1cc..98da875c 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
@@ -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";
 };
 
@@ -268,6 +255,67 @@ Suite
 	};
   };
 
+  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
   {
 	Components
@@ -332,6 +380,69 @@ Suite
 	};
   };
 
+  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;
+	  };
+	};
+
+  };
+
+  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
@@ -409,7 +520,9 @@ SuiteMappings
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
  "map lenny stable";
+ "map lenny-volatile lenny-volatile-proposed-updates";
  "map squeeze testing";
+ "map squeeze-volatile squeeze-volatile-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
 // "map oldstable oldstable-proposed-updates";
@@ -469,6 +582,9 @@ 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/";
+    Lenny-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/lenny-volatile-p-u-new";
+    Squeeze-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/squeeze-volatile-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/";
@@ -509,7 +625,6 @@ Architectures
   armel "ARM eabi";
   i386 "Intel ia32";
   ia64 "Intel ia64";
-  m68k "Motorola Mc680x0";
   mips "MIPS (Big Endian)";
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";