Merge remote branch 'twerner/show-new' into merge

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 328d5811b176b9483ef802f904856b4aa32ab6bc..1411f62a2e6f302e2f72b56bb6b93be8bd3c9171 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -33,7 +33,7 @@ Dinstall
    Reject
    {
      NoSourceOnly "true";
-     ReleaseTransitions "/srv/ftp-master.debian.org/web/transitions.yaml";
+     ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
    };
    // if you setup an own dak repository and want to upload Debian packages you most possibly want
    // to set the following option to a real path/filename and then enter those mail addresses that
@@ -80,12 +80,12 @@ Mirror-Split
 
 Show-New
 {
-  HTMLPath "/srv/ftp-master.debian.org/web/new/";
+  HTMLPath "/srv/ftp.debian.org/web/new/";
 }
 
 Show-Deferred
 {
-  LinkPath "/srv/ftp-master.debian.org/web/deferred/";
+  LinkPath "/srv/ftp.debian.org/web/deferred/";
   DeferredQueue "/srv/queued/DEFERRED/";
 }
 
@@ -125,7 +125,7 @@ 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";
    Bcc "removed-packages@qa.debian.org";
 };
 
@@ -268,6 +268,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 +393,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 +533,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 +595,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/";
@@ -486,7 +615,7 @@ Queue-Report
 {
   ReportLocations
   {
-    822Location "/srv/ftp-master.debian.org/web/new.822";
+    822Location "/srv/ftp.debian.org/web/new.822";
   };
 };
 
@@ -494,7 +623,7 @@ DB
 {
   Name "projectb";
   Host "";
-  Port -1;
+  Port 5433;
 };
 
 Architectures
@@ -653,3 +782,9 @@ Contents
   Header "contents";
   Root "/srv/ftp-master.debian.org/test/";
 }
+
+Common
+{
+  // The default number of threads for multithreading parts of dak:
+  ThreadCount 16;
+}